[[ Cocoa ]] Implemented basic MCPlatformSound API - used by audioclip.

runrevmark · runrevmark · commit 63cacef8895d · 2014-04-09T11:53:05.000+01:00
diff --git a/engine/src/aclip.cpp b/engine/src/aclip.cpp
@@ -615,8 +615,46 @@ Boolean MCAudioClip::import(const char *fname, IO_handle stream)
 
 #if defined FEATURE_PLATFORM_AUDIO
 
+struct au_file_header_t
+{
+    uint32_t magic;
+    uint32_t offset;
+    uint32_t size;
+    uint32_t encoding;
+    uint32_t sample_rate;
+    uint32_t channels;
+};
+
 void MCAudioClip::convert_tocontainer(void*& r_data, size_t& r_data_size)
 {
+    au_file_header_t t_header;
+    t_header . magic = 0x2e736e64;
+    t_header . offset = sizeof(au_file_header_t);
+    t_header . size = size;
+    if (format == AF_MULAW)
+        t_header . encoding = 1;
+    else if (format == AF_SLINEAR)
+        t_header . encoding = (swidth == 1 ? 2 : (swidth == 2 ? 3 : 4));
+    else if (format == AF_ULINEAR)
+    {
+        convert_ulintoslin();
+        t_header . encoding = (swidth == 1 ? 2 : (swidth == 2 ? 3 : 4));
+    }
+    t_header . sample_rate = rate;
+    t_header . channels = nchannels;
+    
+    swap_uint4(&t_header . magic);
+    swap_uint4(&t_header . offset);
+    swap_uint4(&t_header . size);
+    swap_uint4(&t_header . encoding);
+    swap_uint4(&t_header . sample_rate);
+    swap_uint4(&t_header . channels);
+    
+    r_data = malloc(sizeof(au_file_header_t) + size);
+    r_data_size = sizeof(au_file_header_t) + size;
+    
+    memcpy(r_data, &t_header, sizeof(au_file_header_t));
+    memcpy(((au_file_header_t *)r_data) + 1, samples, size);
 }
 
 Boolean MCAudioClip::open_audio(void)
@@ -630,6 +668,11 @@ Boolean MCAudioClip::open_audio(void)
     
     MCPlatformSoundCreateWithData(t_data, t_data_size, s_current_sound);
     
+    free(t_data);
+    
+    if (s_current_sound == nil)
+        return False;
+    
     double t_volume;
     t_volume = loudness / 100.0;
     MCPlatformSoundSetProperty(s_current_sound, kMCPlatformSoundPropertyVolume, kMCPlatformPropertyTypeDouble, &t_volume);
diff --git a/engine/src/cmdse.cpp b/engine/src/cmdse.cpp
@@ -1738,7 +1738,6 @@ Exec_stat MCMM::exec(MCExecPoint &ep)
 			delete fname;
 		}
 		MCacptr->setlooping(looping);
-        MCacptr -> play();
 		MCU_play();
 #ifndef FEATURE_PLATFORM_AUDIO
 		if (MCacptr != NULL)
diff --git a/engine/src/mac-sound.mm b/engine/src/mac-sound.mm
@@ -19,59 +19,112 @@
 #include <AudioToolbox/AudioToolbox.h>
 
 #include "platform.h"
+#include "platform-internal.h"
+
+////////////////////////////////////////////////////////////////////////////////
+
+@interface com_runrev_livecode_MCSoundDelegate: NSObject<NSSoundDelegate>
+
+- (void)sound: (NSSound *)sound didFinishPlaying:(BOOL)finishedPlaying;
+
+@end
+
+@implementation com_runrev_livecode_MCSoundDelegate
+
+- (void)sound:(NSSound *)sound didFinishPlaying:(BOOL)finishedPlaying
+{
+    MCPlatformCallbackSendSoundFinished((MCPlatformSoundRef)sound);
+}
+
+@end
+
+static com_runrev_livecode_MCSoundDelegate *s_delegate = nil;
 
 ////////////////////////////////////////////////////////////////////////////////
 
 void MCPlatformSoundCreateWithData(const void *p_data, size_t p_data_size, MCPlatformSoundRef& r_sound)
 {
+    NSData *t_data;
+    t_data = [NSData dataWithBytes: p_data length: p_data_size];
+    
+    NSSound *t_sound;
+    t_sound = [[NSSound alloc] initWithData: t_data];
+
+    if (s_delegate == nil)
+        s_delegate = [[com_runrev_livecode_MCSoundDelegate alloc] init];
+    
+    [t_sound setDelegate: s_delegate];
+    
+    r_sound = (MCPlatformSoundRef)t_sound;
 }
 
 void MCPlatformSoundRetain(MCPlatformSoundRef self)
 {
     NSSound *t_sound;
     t_sound = (NSSound *)self;
+    [t_sound retain];
 }
 
 void MCPlatformSoundRelease(MCPlatformSoundRef self)
 {
     NSSound *t_sound;
     t_sound = (NSSound *)self;
+    [t_sound release];
 }
 
 bool MCPlatformSoundIsPlaying(MCPlatformSoundRef self)
 {
     NSSound *t_sound;
     t_sound = (NSSound *)self;
+    return [t_sound isPlaying];
 }
 
 void MCPlatformSoundPlay(MCPlatformSoundRef self)
 {
     NSSound *t_sound;
     t_sound = (NSSound *)self;
+    [t_sound play];
 }
 
 void MCPlatformSoundPause(MCPlatformSoundRef self)
 {
     NSSound *t_sound;
     t_sound = (NSSound *)self;
+    [t_sound pause];
 }
 
 void MCPlatformSoundResume(MCPlatformSoundRef self)
 {
     NSSound *t_sound;
     t_sound = (NSSound *)self;
+    [t_sound resume];
 }
 
 void MCPlatformSoundStop(MCPlatformSoundRef self)
 {
     NSSound *t_sound;
     t_sound = (NSSound *)self;
+    [t_sound stop];
 }
 
 void MCPlatformSoundSetProperty(MCPlatformSoundRef self, MCPlatformSoundProperty property, MCPlatformPropertyType type, void *value)
 {
     NSSound *t_sound;
     t_sound = (NSSound *)self;
+    
+    switch(property)
+    {
+        case kMCPlatformSoundPropertyVolume:
+            [t_sound setVolume: *(double *)value];
+            break;
+        case kMCPlatformSoundPropertyLooping:
+            [t_sound setLoops: *(bool *)value];
+            break;
+            
+        default:
+            assert(false);
+            break;
+    }
 }
 
 void MCPlatformSoundGetProperty(MCPlatformSoundRef self, MCPlatformSoundProperty property, MCPlatformPropertyType type, void *value)

Original file line number	Diff line number	Diff line change
`@@ -1738,7 +1738,6 @@ Exec_stat MCMM::exec(MCExecPoint &ep)`
`1738`	`1738`	`delete fname;`
`1739`	`1739`	`}`
`1740`	`1740`	`MCacptr->setlooping(looping);`
`1741`		`- MCacptr -> play();`
`1742`	`1741`	`MCU_play();`
`1743`	`1742`	`#ifndef FEATURE_PLATFORM_AUDIO`
`1744`	`1743`	`if (MCacptr != NULL)`