[Python-checkins] CVS: python/dist/src/Mac/Modules/snd Sndmodule.c,1.24,1.25
Jack Jansen
jackjansen@users.sourceforge.net
Tue, 22 May 2001 14:55:37 -0700
Update of /cvsroot/python/python/dist/src/Mac/Modules/snd
In directory usw-pr-cvs1:/tmp/cvs-serv15087/Python/Mac/Modules/snd
Modified Files:
Sndmodule.c
Log Message:
Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.
Index: Sndmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/snd/Sndmodule.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** Sndmodule.c 2001/01/12 23:39:59 1.24
--- Sndmodule.c 2001/05/22 21:55:35 1.25
***************
*** 9,15 ****
#include "pymactoolbox.h"
#include <Sound.h>
-
#include <OSUtils.h> /* for Set(Current)A5 */
/* Create a SndCommand object (an (int, int, int) tuple) */
--- 9,19 ----
#include "pymactoolbox.h"
+ #ifdef WITHOUT_FRAMEWORKS
#include <Sound.h>
#include <OSUtils.h> /* for Set(Current)A5 */
+ #else
+ #include <Carbon/Carbon.h>
+ #endif
+
/* Create a SndCommand object (an (int, int, int) tuple) */
***************
*** 59,64 ****
} SndChannelObject;
! static PyObject *SndCh_New(itself)
! SndChannelPtr itself;
{
SndChannelObject *it;
--- 63,67 ----
} SndChannelObject;
! static PyObject *SndCh_New(SndChannelPtr itself)
{
SndChannelObject *it;
***************
*** 70,76 ****
return (PyObject *)it;
}
! static SndCh_Convert(v, p_itself)
! PyObject *v;
! SndChannelPtr *p_itself;
{
if (!SndCh_Check(v))
--- 73,77 ----
return (PyObject *)it;
}
! static SndCh_Convert(PyObject *v, SndChannelPtr *p_itself)
{
if (!SndCh_Check(v))
***************
*** 83,88 ****
}
! static void SndCh_dealloc(self)
! SndChannelObject *self;
{
SndDisposeChannel(self->ob_itself, 1);
--- 84,88 ----
}
! static void SndCh_dealloc(SndChannelObject *self)
{
SndDisposeChannel(self->ob_itself, 1);
***************
*** 91,97 ****
}
! static PyObject *SndCh_SndDoCommand(_self, _args)
! SndChannelObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 91,95 ----
}
! static PyObject *SndCh_SndDoCommand(SndChannelObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 112,118 ****
}
! static PyObject *SndCh_SndDoImmediate(_self, _args)
! SndChannelObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 110,114 ----
}
! static PyObject *SndCh_SndDoImmediate(SndChannelObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 130,136 ****
}
! static PyObject *SndCh_SndPlay(_self, _args)
! SndChannelObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 126,130 ----
}
! static PyObject *SndCh_SndPlay(SndChannelObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 153,159 ****
#if !TARGET_API_MAC_CARBON
! static PyObject *SndCh_SndStartFilePlay(_self, _args)
! SndChannelObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 147,151 ----
#if !TARGET_API_MAC_CARBON
! static PyObject *SndCh_SndStartFilePlay(SndChannelObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 186,192 ****
#if !TARGET_API_MAC_CARBON
! static PyObject *SndCh_SndPauseFilePlay(_self, _args)
! SndChannelObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 178,182 ----
#if !TARGET_API_MAC_CARBON
! static PyObject *SndCh_SndPauseFilePlay(SndChannelObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 204,210 ****
#if !TARGET_API_MAC_CARBON
! static PyObject *SndCh_SndStopFilePlay(_self, _args)
! SndChannelObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 194,198 ----
#if !TARGET_API_MAC_CARBON
! static PyObject *SndCh_SndStopFilePlay(SndChannelObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 223,229 ****
#endif
! static PyObject *SndCh_SndChannelStatus(_self, _args)
! SndChannelObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 211,215 ----
#endif
! static PyObject *SndCh_SndChannelStatus(SndChannelObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 244,250 ****
}
! static PyObject *SndCh_SndGetInfo(_self, _args)
! SndChannelObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 230,234 ----
}
! static PyObject *SndCh_SndGetInfo(SndChannelObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 265,271 ****
}
! static PyObject *SndCh_SndSetInfo(_self, _args)
! SndChannelObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 249,253 ----
}
! static PyObject *SndCh_SndSetInfo(SndChannelObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 319,325 ****
static PyMethodChain SndCh_chain = { SndCh_methods, NULL };
! static PyObject *SndCh_getattr(self, name)
! SndChannelObject *self;
! char *name;
{
return Py_FindMethodInChain(&SndCh_chain, (PyObject *)self, name);
--- 301,305 ----
static PyMethodChain SndCh_chain = { SndCh_methods, NULL };
! static PyObject *SndCh_getattr(SndChannelObject *self, char *name)
{
return Py_FindMethodInChain(&SndCh_chain, (PyObject *)self, name);
***************
*** 385,391 ****
return (PyObject *)it;
}
! static SPBObj_Convert(v, p_itself)
! PyObject *v;
! SPBPtr *p_itself;
{
if (!SPBObj_Check(v))
--- 365,369 ----
return (PyObject *)it;
}
! static SPBObj_Convert(PyObject *v, SPBPtr *p_itself)
{
if (!SPBObj_Check(v))
***************
*** 398,403 ****
}
! static void SPBObj_dealloc(self)
! SPBObject *self;
{
/* Cleanup of self->ob_itself goes here */
--- 376,380 ----
}
! static void SPBObj_dealloc(SPBObject *self)
{
/* Cleanup of self->ob_itself goes here */
***************
*** 415,421 ****
static PyMethodChain SPBObj_chain = { SPBObj_methods, NULL };
! static PyObject *SPBObj_getattr(self, name)
! SPBObject *self;
! char *name;
{
--- 392,396 ----
static PyMethodChain SPBObj_chain = { SPBObj_methods, NULL };
! static PyObject *SPBObj_getattr(SPBObject *self, char *name)
{
***************
*** 431,438 ****
}
! static int SPBObj_setattr(self, name, value)
! SPBObject *self;
! char *name;
! PyObject *value;
{
--- 406,410 ----
}
! static int SPBObj_setattr(SPBObject *self, char *name, PyObject *value)
{
***************
*** 448,452 ****
rv = PyArg_Parse(value, "w#", &self->ob_spb.bufferPtr, &self->ob_spb.bufferLength);
else if (strcmp(name, "completionRoutine") == 0) {
! self->ob_spb.completionRoutine = NewSICompletionProc(SPB_completion);
self->ob_completion = value;
Py_INCREF(value);
--- 420,424 ----
rv = PyArg_Parse(value, "w#", &self->ob_spb.bufferPtr, &self->ob_spb.bufferLength);
else if (strcmp(name, "completionRoutine") == 0) {
! self->ob_spb.completionRoutine = NewSICompletionUPP(SPB_completion);
self->ob_completion = value;
Py_INCREF(value);
***************
*** 454,458 ****
#if !TARGET_API_MAC_CARBON
} else if (strcmp(name, "interruptRoutine") == 0) {
! self->ob_spb.completionRoutine = NewSIInterruptProc(SPB_interrupt);
self->ob_interrupt = value;
Py_INCREF(value);
--- 426,430 ----
#if !TARGET_API_MAC_CARBON
} else if (strcmp(name, "interruptRoutine") == 0) {
! self->ob_spb.completionRoutine = NewSIInterruptUPP(SPB_interrupt);
self->ob_interrupt = value;
Py_INCREF(value);
***************
*** 492,498 ****
! static PyObject *Snd_SPB(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 464,468 ----
! static PyObject *Snd_SPB(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 500,506 ****
}
! static PyObject *Snd_SysBeep(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 470,474 ----
}
! static PyObject *Snd_SysBeep(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 515,521 ****
}
! static PyObject *Snd_SndNewChannel(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 483,487 ----
}
! static PyObject *Snd_SndNewChannel(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 538,542 ****
synth,
init,
! NewSndCallBackProc(SndCh_UserRoutine));
if (_err != noErr) return PyMac_Error(_err);
_res = Py_BuildValue("O&",
--- 504,508 ----
synth,
init,
! NewSndCallBackUPP(SndCh_UserRoutine));
if (_err != noErr) return PyMac_Error(_err);
_res = Py_BuildValue("O&",
***************
*** 555,561 ****
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_SndControl(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 521,525 ----
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_SndControl(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 575,581 ****
#endif
! static PyObject *Snd_SndSoundManagerVersion(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 539,543 ----
#endif
! static PyObject *Snd_SndSoundManagerVersion(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 589,595 ****
}
! static PyObject *Snd_SndManagerStatus(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 551,555 ----
}
! static PyObject *Snd_SndManagerStatus(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 609,615 ****
}
! static PyObject *Snd_SndGetSysBeepState(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 569,573 ----
}
! static PyObject *Snd_SndGetSysBeepState(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 623,629 ****
}
! static PyObject *Snd_SndSetSysBeepState(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 581,585 ----
}
! static PyObject *Snd_SndSetSysBeepState(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 642,648 ****
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_MACEVersion(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 598,602 ----
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_MACEVersion(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 659,665 ****
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_Comp3to1(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 613,617 ----
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_Comp3to1(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 706,712 ****
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_Exp1to3(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 658,662 ----
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_Exp1to3(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 753,759 ****
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_Comp6to1(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 703,707 ----
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_Comp6to1(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 800,806 ****
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_Exp1to6(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 748,752 ----
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_Exp1to6(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 845,851 ****
#endif
! static PyObject *Snd_GetSysBeepVolume(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 791,795 ----
#endif
! static PyObject *Snd_GetSysBeepVolume(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 861,867 ****
}
! static PyObject *Snd_SetSysBeepVolume(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 805,809 ----
}
! static PyObject *Snd_SetSysBeepVolume(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 878,884 ****
}
! static PyObject *Snd_GetDefaultOutputVolume(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 820,824 ----
}
! static PyObject *Snd_GetDefaultOutputVolume(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 894,900 ****
}
! static PyObject *Snd_SetDefaultOutputVolume(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 834,838 ----
}
! static PyObject *Snd_SetDefaultOutputVolume(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 911,917 ****
}
! static PyObject *Snd_GetSoundHeaderOffset(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 849,853 ----
}
! static PyObject *Snd_GetSoundHeaderOffset(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 930,936 ****
}
! static PyObject *Snd_GetCompressionInfo(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 866,870 ----
}
! static PyObject *Snd_GetCompressionInfo(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 959,965 ****
}
! static PyObject *Snd_SetSoundPreference(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 893,897 ----
}
! static PyObject *Snd_SetSoundPreference(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 981,987 ****
}
! static PyObject *Snd_GetSoundPreference(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 913,917 ----
}
! static PyObject *Snd_GetSoundPreference(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1003,1009 ****
}
! static PyObject *Snd_GetCompressionName(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 933,937 ----
}
! static PyObject *Snd_GetCompressionName(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1022,1028 ****
}
! static PyObject *Snd_SPBVersion(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 950,954 ----
}
! static PyObject *Snd_SPBVersion(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1036,1042 ****
}
! static PyObject *Snd_SPBSignInDevice(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 962,966 ----
}
! static PyObject *Snd_SPBSignInDevice(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1056,1062 ****
}
! static PyObject *Snd_SPBSignOutDevice(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 980,984 ----
}
! static PyObject *Snd_SPBSignOutDevice(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1073,1079 ****
}
! static PyObject *Snd_SPBGetIndexedDevice(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 995,999 ----
}
! static PyObject *Snd_SPBGetIndexedDevice(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1095,1101 ****
}
! static PyObject *Snd_SPBOpenDevice(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1015,1019 ----
}
! static PyObject *Snd_SPBOpenDevice(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1117,1123 ****
}
! static PyObject *Snd_SPBCloseDevice(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1035,1039 ----
}
! static PyObject *Snd_SPBCloseDevice(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1134,1140 ****
}
! static PyObject *Snd_SPBRecord(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1050,1054 ----
}
! static PyObject *Snd_SPBRecord(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1156,1162 ****
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_SPBRecordToFile(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1070,1074 ----
#if !TARGET_API_MAC_CARBON
! static PyObject *Snd_SPBRecordToFile(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1180,1186 ****
#endif
! static PyObject *Snd_SPBPauseRecording(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1092,1096 ----
#endif
! static PyObject *Snd_SPBPauseRecording(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1197,1203 ****
}
! static PyObject *Snd_SPBResumeRecording(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1107,1111 ----
}
! static PyObject *Snd_SPBResumeRecording(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1214,1220 ****
}
! static PyObject *Snd_SPBStopRecording(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1122,1126 ----
}
! static PyObject *Snd_SPBStopRecording(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1231,1237 ****
}
! static PyObject *Snd_SPBGetRecordingStatus(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1137,1141 ----
}
! static PyObject *Snd_SPBGetRecordingStatus(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1265,1271 ****
}
! static PyObject *Snd_SPBGetDeviceInfo(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1169,1173 ----
}
! static PyObject *Snd_SPBGetDeviceInfo(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1288,1294 ****
}
! static PyObject *Snd_SPBSetDeviceInfo(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1190,1194 ----
}
! static PyObject *Snd_SPBSetDeviceInfo(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1311,1317 ****
}
! static PyObject *Snd_SPBMillisecondsToBytes(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1211,1215 ----
}
! static PyObject *Snd_SPBMillisecondsToBytes(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1330,1336 ****
}
! static PyObject *Snd_SPBBytesToMilliseconds(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1228,1232 ----
}
! static PyObject *Snd_SPBBytesToMilliseconds(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1454,1459 ****
/* Routine passed to Py_AddPendingCall -- call the Python callback */
static int
! SndCh_CallCallBack(arg)
! void *arg;
{
SndChannelObject *p = (SndChannelObject *)arg;
--- 1350,1354 ----
/* Routine passed to Py_AddPendingCall -- call the Python callback */
static int
! SndCh_CallCallBack(void *arg)
{
SndChannelObject *p = (SndChannelObject *)arg;
***************
*** 1485,1490 ****
/* SPB callbacks - Schedule callbacks to Python */
static int
! SPB_CallCallBack(arg)
! void *arg;
{
SPBObject *p = (SPBObject *)arg;
--- 1380,1384 ----
/* SPB callbacks - Schedule callbacks to Python */
static int
! SPB_CallCallBack(void *arg)
{
SPBObject *p = (SPBObject *)arg;
***************
*** 1532,1536 ****
! void initSnd()
{
PyObject *m;
--- 1426,1430 ----
! void initSnd(void)
{
PyObject *m;