1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-07 04:10:08 +00:00
This commit is contained in:
jules 2008-05-23 07:54:25 +00:00
parent 847a4d84b7
commit d21baa74d8
3 changed files with 25 additions and 26 deletions

View file

@ -1,22 +1,14 @@
ARCHS = i386 ppc
// For 10.2 (and later) compatibility, use these values:
//GCC_VERSION_ppc = 3.3
//MACOSX_DEPLOYMENT_TARGET = 10.4
//MACOSX_DEPLOYMENT_TARGET_ppc = 10.2
//OTHER_LD_FLAGS_ppc = $(DEVELOPER_SDK_DIR)/MacOSX10.2.8.sdk/usr/lib/gcc/darwin/3.3/libstdc++.a
//SDKROOT_ppc = $(DEVELOPER_SDK_DIR)/MacOSX10.2.8.sdk
// These settings let you build for compatibility with 10.3 onwards.
// For 10.3 (and later) compatibility, use these instead:
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3
MACOSX_DEPLOYMENT_TARGET = 10.4
SDKROOT_ppc = $(DEVELOPER_SDK_DIR)/MacOSX10.3.9.sdk
SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk
// For 10.4 (and later) compatibility, use these instead:
// MACOSX_DEPLOYMENT_TARGET = 10.4
// SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk
// In XCode 3, this is the best SDK to use..
SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk
// For 10.5 (and later) compatibility, use these instead:
// MACOSX_DEPLOYMENT_TARGET = 10.5
// SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk
// (if you're building in XCode 2.5, you might need to use this line
// instead of the 10.5 line above..)
//SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk

View file

@ -152,10 +152,12 @@ END_JUCE_NAMESPACE
[device acquireMediaReservation];
NSMutableDictionary* d = [[burn properties] mutableCopy];
[d autorelease];
[d setObject: [NSNumber numberWithBool: peformFakeBurnForTesting] forKey: DRBurnTestingKey];
[d setObject: [NSNumber numberWithBool: false] forKey: DRBurnVerifyDiscKey];
[d setObject: (shouldEject ? DRBurnCompletionActionEject : DRBurnCompletionActionMount)
forKey: DRBurnCompletionActionKey];
[burn setProperties: d];
[d release];
[burn writeLayout: tracks];
@ -164,6 +166,8 @@ END_JUCE_NAMESPACE
juce::Thread::sleep (300);
float progress = [[[burn status] objectForKey: DRStatusPercentCompleteKey] floatValue];
NSLog ([[burn status] description]);
if (listener != 0 && listener->audioCDBurnProgress (progress))
{
[burn abort];
@ -178,11 +182,9 @@ END_JUCE_NAMESPACE
}
else if ([[[burn status] objectForKey: DRStatusStateKey] isEqualTo: DRStatusStateDone])
{
if (shouldEject)
[device openTray];
break;
}
NSString* err = (NSString*) [[[burn status] objectForKey: DRErrorStatusKey]
objectForKey: DRErrorStatusErrorStringKey];
@ -211,19 +213,21 @@ END_JUCE_NAMESPACE
- (void) setupTrackProperties: (DRTrack*) track
{
NSMutableDictionary* p = [[track properties] mutableCopy];
[p setObject: [DRMSF msfWithFrames: lengthInFrames] forKey: DRTrackLengthKey];
[p setObject: [NSNumber numberWithUnsignedShort: 2048] forKey: DRBlockSizeKey];
[p setObject: [NSNumber numberWithInt: 16] forKey: DRDataFormKey];
[p setObject: [NSNumber numberWithInt: 8] forKey: DRBlockTypeKey];
[p setObject: [NSNumber numberWithInt: 4] forKey: DRTrackModeKey];
[p setObject: [NSNumber numberWithInt: 0] forKey: DRSessionFormatKey];
[p setObject:[DRMSF msfWithFrames: lengthInFrames] forKey: DRTrackLengthKey];
[p setObject:[NSNumber numberWithUnsignedShort:2352] forKey: DRBlockSizeKey];
[p setObject:[NSNumber numberWithInt:0] forKey: DRDataFormKey];
[p setObject:[NSNumber numberWithInt:0] forKey: DRBlockTypeKey];
[p setObject:[NSNumber numberWithInt:0] forKey: DRTrackModeKey];
[p setObject:[NSNumber numberWithInt:0] forKey: DRSessionFormatKey];
[track setProperties: p];
[p release];
}
- (AudioTrackProducer*) initWithAudioSource: (juce::AudioSource*) source_ numSamples: (int) lengthInSamples
{
AudioTrackProducer* s = [self init: lengthInSamples / (44100 / 75)];
AudioTrackProducer* s = [self init: (lengthInSamples + 587) / 588];
if (s != nil)
s->source = source_;

View file

@ -253,6 +253,9 @@ void Synthesiser::startVoice (SynthesiserVoice* const voice,
{
if (voice != 0 && sound != 0)
{
if (voice->currentlyPlayingSound != 0)
voice->stopNote (false);
voice->startNote (midiNoteNumber,
velocity,
sound,