fixed issue about AVAudioSession.

wdkk · Oct 19, 2016 · b78655f · b78655f
1 parent 161b619
commit b78655f
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 10 deletions.
diff --git a/common/sc_popen.cpp b/common/sc_popen.cpp
@@ -54,7 +54,11 @@ sc_popen(const char *command, pid_t *pidp, const char *type)
 	argv[1] = (char *)"-c";
 	argv[2] = (char *)command;
 	argv[3] = NULL;
-
+#if defined(SC_TVOS)
+    (void)close(pdes[0]);
+    (void)close(pdes[1]);
+    return (NULL);
+#else
 	switch (pid = fork()) {
 	case -1:			/* Error. */
 		(void)close(pdes[0]);
@@ -91,7 +95,8 @@ sc_popen(const char *command, pid_t *pidp, const char *type)
 		exit(127);
 		/* NOTREACHED */
 	}
-
+#endif
+
 	/* Parent; assume fdopen can't fail. */
 	if (*type == 'r') {
 		iop = fdopen(pdes[0], type);

diff --git a/iSCKit/iSC.mm b/iSCKit/iSC.mm
@@ -308,7 +308,9 @@ - (id) init
         internal_log_view = [[iSCLogView alloc] initWithFrame:[UIScreen mainScreen].bounds];
         internal_log_view.textColor = [UIColor blueColor];
         internal_log_view.font = [UIFont systemFontOfSize:10.0];
+#if !defined(SC_TVOS)
         internal_log_view.editable = NO;
+#endif
         [internal_log_view setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [internal_log_view setAutocorrectionType:UITextAutocorrectionTypeNo];
 	}

diff --git a/lang/LangPrimSource/PyrPrimitive.cpp b/lang/LangPrimSource/PyrPrimitive.cpp
@@ -4173,7 +4173,7 @@ void initSCViewPrimitives();
 void initSchedPrimitives();
 	initSchedPrimitives();
 
-#if defined(__APPLE__) || defined(HAVE_ALSA) || defined(HAVE_PORTMIDI)
+#if (defined(__APPLE__) || defined(HAVE_ALSA) || defined(HAVE_PORTMIDI)) && !defined(SC_TVOS)
 void initMIDIPrimitives();
 	initMIDIPrimitives();
 #endif

diff --git a/lang/LangPrimSource/PyrUnixPrim.cpp b/lang/LangPrimSource/PyrUnixPrim.cpp
@@ -56,10 +56,13 @@ int prString_System(struct VMGlobals *g, int numArgsPushed)
 	char cmdline[1024];
 	int err = slotStrVal(a, cmdline, 1023);
 	if (err) return err;
-
+#if !defined(SC_TVOS)
 	int res = system(cmdline);
 	SetInt(a, res);
-
+#else
+    SetInt(a, 1);
+#endif
+
 	return errNone;
 }
 

diff --git a/lang/LangPrimSource/SC_CoreMIDI.cpp b/lang/LangPrimSource/SC_CoreMIDI.cpp
@@ -34,6 +34,8 @@ added prRestartMIDI
 #include <CoreAudio/HostTime.h>
 #include <Carbon/Carbon.h>
 #endif
+
+#if !defined(SC_TVOS)
 #include <CoreMIDI/CoreMIDI.h>
 #include <vector>
 #include "SCBase.h"
@@ -809,3 +811,5 @@ void initMIDIPrimitives()
 	definePrimitive(base, index++, "_SendSysex", prSendSysex, 3, 0);
 	if(gMIDIClient) midiCleanUp();
 }
+#endif
+
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/kengo.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/kengo.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/server/plugins/iPhoneUGens.mm b/server/plugins/iPhoneUGens.mm
@@ -20,7 +20,7 @@
 
 #include <TargetConditionals.h>
 
-#if defined(SC_IPHONE) && !TARGET_IPHONE_SIMULATOR
+#if defined(SC_IPHONE) && !TARGET_IPHONE_SIMULATOR && !defined(SC_TVOS)
 
 #import <UIKit/UIKit.h>
 #import <CoreMotion/CoreMotion.h>
@@ -35,7 +35,7 @@
 
 static InterfaceTable *ft;
 
-@interface AccelerometerDelegate : NSObject<UIAccelerometerDelegate>
+@interface AccelerometerDelegate : NSObject//<UIAccelerometerDelegate>
 {
 	UIAccelerationValue accel_x, accel_y, accel_z;
 }
@@ -183,18 +183,18 @@ - (id) init
 	return self;
 }
 
+/*
 - (void) accelerometer:(UIAccelerometer *)accelerometer didAccelerate:(UIAcceleration *)acceleration
 {
 	accel_x = acceleration.x;
 	accel_y = acceleration.y;
 	accel_z = acceleration.z;
 	
-/*
 	accel_x += ([acceleration x] - accel_x)*0.8f;
 	accel_y += ([acceleration y] - accel_y)*0.8f;
 	accel_z += ([acceleration z] - accel_z)*0.8f;
-*/	
 }
+*/
 
 - (float) accel_x
 {

diff --git a/server/scsynth/SC_CoreAudio.mm b/server/scsynth/SC_CoreAudio.mm
@@ -2447,7 +2447,7 @@ void AudioSessionInterruptionCbk(void *inClientData, UInt32 inInterruptionState)
 	//}
     if(av_session.inputAvailable)
     {
-        category = AVAudioSessionCategoryPlayback;  // kengo:as03 (playing only)
+        category = AVAudioSessionCategoryPlayAndRecord;  // kengo:as03 (playing only)
         //category = AVAudioSessionCategoryAmbient; // kengo:as03-2
     }
 #endif