Commit 319c67b6 authored by Jack Jansen's avatar Jack Jansen

The interruptRoutine attribute is gone under Carbon. Luckily it appears that nothing used it.

parent 736b51df
...@@ -37,7 +37,9 @@ SndCmd_Convert(PyObject *v, SndCommand *pc) ...@@ -37,7 +37,9 @@ SndCmd_Convert(PyObject *v, SndCommand *pc)
static pascal void SndCh_UserRoutine(SndChannelPtr chan, SndCommand *cmd); /* Forward */ static pascal void SndCh_UserRoutine(SndChannelPtr chan, SndCommand *cmd); /* Forward */
static pascal void SPB_completion(SPBPtr my_spb); /* Forward */ static pascal void SPB_completion(SPBPtr my_spb); /* Forward */
#if !TARGET_API_MAC_CARBON
static pascal void SPB_interrupt(SPBPtr my_spb); /* Forward */ static pascal void SPB_interrupt(SPBPtr my_spb); /* Forward */
#endif
static PyObject *Snd_Error; static PyObject *Snd_Error;
...@@ -449,7 +451,7 @@ static int SPBObj_setattr(self, name, value) ...@@ -449,7 +451,7 @@ static int SPBObj_setattr(self, name, value)
self->ob_completion = value; self->ob_completion = value;
Py_INCREF(value); Py_INCREF(value);
rv = 1; rv = 1;
#if !TARGET_API_MAC_CARBON_NOTYET #if !TARGET_API_MAC_CARBON
} else if (strcmp(name, "interruptRoutine") == 0) { } else if (strcmp(name, "interruptRoutine") == 0) {
self->ob_spb.completionRoutine = NewSIInterruptProc(SPB_interrupt); self->ob_spb.completionRoutine = NewSIInterruptProc(SPB_interrupt);
self->ob_interrupt = value; self->ob_interrupt = value;
...@@ -1513,6 +1515,7 @@ SPB_completion(SPBPtr my_spb) ...@@ -1513,6 +1515,7 @@ SPB_completion(SPBPtr my_spb)
} }
} }
#if !TARGET_API_MAC_CARBON
static pascal void static pascal void
SPB_interrupt(SPBPtr my_spb) SPB_interrupt(SPBPtr my_spb)
{ {
...@@ -1525,6 +1528,7 @@ SPB_interrupt(SPBPtr my_spb) ...@@ -1525,6 +1528,7 @@ SPB_interrupt(SPBPtr my_spb)
SetA5(A5); SetA5(A5);
} }
} }
#endif
void initSnd() void initSnd()
......
...@@ -117,7 +117,9 @@ SndCmd_Convert(PyObject *v, SndCommand *pc) ...@@ -117,7 +117,9 @@ SndCmd_Convert(PyObject *v, SndCommand *pc)
static pascal void SndCh_UserRoutine(SndChannelPtr chan, SndCommand *cmd); /* Forward */ static pascal void SndCh_UserRoutine(SndChannelPtr chan, SndCommand *cmd); /* Forward */
static pascal void SPB_completion(SPBPtr my_spb); /* Forward */ static pascal void SPB_completion(SPBPtr my_spb); /* Forward */
#if !TARGET_API_MAC_CARBON
static pascal void SPB_interrupt(SPBPtr my_spb); /* Forward */ static pascal void SPB_interrupt(SPBPtr my_spb); /* Forward */
#endif
""" """
...@@ -186,6 +188,7 @@ SPB_completion(SPBPtr my_spb) ...@@ -186,6 +188,7 @@ SPB_completion(SPBPtr my_spb)
} }
} }
#if !TARGET_API_MAC_CARBON
static pascal void static pascal void
SPB_interrupt(SPBPtr my_spb) SPB_interrupt(SPBPtr my_spb)
{ {
...@@ -198,6 +201,7 @@ SPB_interrupt(SPBPtr my_spb) ...@@ -198,6 +201,7 @@ SPB_interrupt(SPBPtr my_spb)
SetA5(A5); SetA5(A5);
} }
} }
#endif
""" """
...@@ -309,7 +313,7 @@ class SpbObjectDefinition(ObjectDefinition): ...@@ -309,7 +313,7 @@ class SpbObjectDefinition(ObjectDefinition):
self->ob_completion = value; self->ob_completion = value;
Py_INCREF(value); Py_INCREF(value);
rv = 1; rv = 1;
#if !TARGET_API_MAC_CARBON_NOTYET #if !TARGET_API_MAC_CARBON
} else if (strcmp(name, "interruptRoutine") == 0) { } else if (strcmp(name, "interruptRoutine") == 0) {
self->ob_spb.completionRoutine = NewSIInterruptProc(SPB_interrupt); self->ob_spb.completionRoutine = NewSIInterruptProc(SPB_interrupt);
self->ob_interrupt = value; self->ob_interrupt = value;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment