Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f6969fa

Browse files
jackjansenjackjansen
committed
Removed availabe() method again: even on PPC it sometimes returns 1 while
quicktime isn't available. Use gestalt in stead for this functionality.
1 parent 9502692 commit f6969fa

2 files changed

Lines changed: 0 additions & 104 deletions

File tree

‎Mac/Modules/qt/Qtmodule.c‎

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,12 +1021,6 @@ static PyObject *MovieCtlObj_getattr(self, name)
10211021

10221022
#define MovieCtlObj_setattr NULL
10231023

1024-
#define MovieCtlObj_compare NULL
1025-
1026-
#define MovieCtlObj_repr NULL
1027-
1028-
#define MovieCtlObj_hash NULL
1029-
10301024
PyTypeObject MovieController_Type = {
10311025
PyObject_HEAD_INIT(&PyType_Type)
10321026
0, /*ob_size*/
@@ -1038,12 +1032,6 @@ PyTypeObject MovieController_Type = {
10381032
0, /*tp_print*/
10391033
(getattrfunc) MovieCtlObj_getattr, /*tp_getattr*/
10401034
(setattrfunc) MovieCtlObj_setattr, /*tp_setattr*/
1041-
(cmpfunc) MovieCtlObj_compare, /*tp_compare*/
1042-
(reprfunc) MovieCtlObj_repr, /*tp_repr*/
1043-
(PyNumberMethods *)0, /* tp_as_number */
1044-
(PySequenceMethods *)0, /* tp_as_sequence */
1045-
(PyMappingMethods *)0, /* tp_as_mapping */
1046-
(hashfunc) MovieCtlObj_hash, /*tp_hash*/
10471035
};
10481036

10491037
/* ---------------- End object type MovieController ----------------- */
@@ -1458,12 +1446,6 @@ static PyObject *TimeBaseObj_getattr(self, name)
14581446

14591447
#define TimeBaseObj_setattr NULL
14601448

1461-
#define TimeBaseObj_compare NULL
1462-
1463-
#define TimeBaseObj_repr NULL
1464-
1465-
#define TimeBaseObj_hash NULL
1466-
14671449
PyTypeObject TimeBase_Type = {
14681450
PyObject_HEAD_INIT(&PyType_Type)
14691451
0, /*ob_size*/
@@ -1475,12 +1457,6 @@ PyTypeObject TimeBase_Type = {
14751457
0, /*tp_print*/
14761458
(getattrfunc) TimeBaseObj_getattr, /*tp_getattr*/
14771459
(setattrfunc) TimeBaseObj_setattr, /*tp_setattr*/
1478-
(cmpfunc) TimeBaseObj_compare, /*tp_compare*/
1479-
(reprfunc) TimeBaseObj_repr, /*tp_repr*/
1480-
(PyNumberMethods *)0, /* tp_as_number */
1481-
(PySequenceMethods *)0, /* tp_as_sequence */
1482-
(PyMappingMethods *)0, /* tp_as_mapping */
1483-
(hashfunc) TimeBaseObj_hash, /*tp_hash*/
14841460
};
14851461

14861462
/* -------------------- End object type TimeBase -------------------- */
@@ -1759,12 +1735,6 @@ static PyObject *UserDataObj_getattr(self, name)
17591735

17601736
#define UserDataObj_setattr NULL
17611737

1762-
#define UserDataObj_compare NULL
1763-
1764-
#define UserDataObj_repr NULL
1765-
1766-
#define UserDataObj_hash NULL
1767-
17681738
PyTypeObject UserData_Type = {
17691739
PyObject_HEAD_INIT(&PyType_Type)
17701740
0, /*ob_size*/
@@ -1776,12 +1746,6 @@ PyTypeObject UserData_Type = {
17761746
0, /*tp_print*/
17771747
(getattrfunc) UserDataObj_getattr, /*tp_getattr*/
17781748
(setattrfunc) UserDataObj_setattr, /*tp_setattr*/
1779-
(cmpfunc) UserDataObj_compare, /*tp_compare*/
1780-
(reprfunc) UserDataObj_repr, /*tp_repr*/
1781-
(PyNumberMethods *)0, /* tp_as_number */
1782-
(PySequenceMethods *)0, /* tp_as_sequence */
1783-
(PyMappingMethods *)0, /* tp_as_mapping */
1784-
(hashfunc) UserDataObj_hash, /*tp_hash*/
17851749
};
17861750

17871751
/* -------------------- End object type UserData -------------------- */
@@ -2842,12 +2806,6 @@ static PyObject *MediaObj_getattr(self, name)
28422806

28432807
#define MediaObj_setattr NULL
28442808

2845-
#define MediaObj_compare NULL
2846-
2847-
#define MediaObj_repr NULL
2848-
2849-
#define MediaObj_hash NULL
2850-
28512809
PyTypeObject Media_Type = {
28522810
PyObject_HEAD_INIT(&PyType_Type)
28532811
0, /*ob_size*/
@@ -2859,12 +2817,6 @@ PyTypeObject Media_Type = {
28592817
0, /*tp_print*/
28602818
(getattrfunc) MediaObj_getattr, /*tp_getattr*/
28612819
(setattrfunc) MediaObj_setattr, /*tp_setattr*/
2862-
(cmpfunc) MediaObj_compare, /*tp_compare*/
2863-
(reprfunc) MediaObj_repr, /*tp_repr*/
2864-
(PyNumberMethods *)0, /* tp_as_number */
2865-
(PySequenceMethods *)0, /* tp_as_sequence */
2866-
(PyMappingMethods *)0, /* tp_as_mapping */
2867-
(hashfunc) MediaObj_hash, /*tp_hash*/
28682820
};
28692821

28702822
/* --------------------- End object type Media ---------------------- */
@@ -4022,12 +3974,6 @@ static PyObject *TrackObj_getattr(self, name)
40223974

40233975
#define TrackObj_setattr NULL
40243976

4025-
#define TrackObj_compare NULL
4026-
4027-
#define TrackObj_repr NULL
4028-
4029-
#define TrackObj_hash NULL
4030-
40313977
PyTypeObject Track_Type = {
40323978
PyObject_HEAD_INIT(&PyType_Type)
40333979
0, /*ob_size*/
@@ -4039,12 +3985,6 @@ PyTypeObject Track_Type = {
40393985
0, /*tp_print*/
40403986
(getattrfunc) TrackObj_getattr, /*tp_getattr*/
40413987
(setattrfunc) TrackObj_setattr, /*tp_setattr*/
4042-
(cmpfunc) TrackObj_compare, /*tp_compare*/
4043-
(reprfunc) TrackObj_repr, /*tp_repr*/
4044-
(PyNumberMethods *)0, /* tp_as_number */
4045-
(PySequenceMethods *)0, /* tp_as_sequence */
4046-
(PyMappingMethods *)0, /* tp_as_mapping */
4047-
(hashfunc) TrackObj_hash, /*tp_hash*/
40483988
};
40493989

40503990
/* --------------------- End object type Track ---------------------- */
@@ -6169,12 +6109,6 @@ static PyObject *MovieObj_getattr(self, name)
61696109

61706110
#define MovieObj_setattr NULL
61716111

6172-
#define MovieObj_compare NULL
6173-
6174-
#define MovieObj_repr NULL
6175-
6176-
#define MovieObj_hash NULL
6177-
61786112
PyTypeObject Movie_Type = {
61796113
PyObject_HEAD_INIT(&PyType_Type)
61806114
0, /*ob_size*/
@@ -6186,12 +6120,6 @@ PyTypeObject Movie_Type = {
61866120
0, /*tp_print*/
61876121
(getattrfunc) MovieObj_getattr, /*tp_getattr*/
61886122
(setattrfunc) MovieObj_setattr, /*tp_setattr*/
6189-
(cmpfunc) MovieObj_compare, /*tp_compare*/
6190-
(reprfunc) MovieObj_repr, /*tp_repr*/
6191-
(PyNumberMethods *)0, /* tp_as_number */
6192-
(PySequenceMethods *)0, /* tp_as_sequence */
6193-
(PyMappingMethods *)0, /* tp_as_mapping */
6194-
(hashfunc) MovieObj_hash, /*tp_hash*/
61956123
};
61966124

61976125
/* --------------------- End object type Movie ---------------------- */
@@ -7738,21 +7666,6 @@ static PyObject *Qt_MoviesTask(_self, _args)
77387666
return _res;
77397667
}
77407668

7741-
static PyObject *Qt_available(_self, _args)
7742-
PyObject *_self;
7743-
PyObject *_args;
7744-
{
7745-
PyObject *_res = NULL;
7746-
7747-
void *ptr;
7748-
7749-
if ( !PyArg_ParseTuple(_args, "") )
7750-
return NULL;
7751-
ptr = (void *)&EnterMovies;
7752-
return Py_BuildValue("i", ((long)ptr != 0));
7753-
7754-
}
7755-
77567669
static PyMethodDef Qt_methods[] = {
77577670
{"EnterMovies", (PyCFunction)Qt_EnterMovies, 1,
77587671
"() -> None"},
@@ -7892,8 +7805,6 @@ static PyMethodDef Qt_methods[] = {
78927805
"(WindowPtr wp, Point startPt, Rect boundsRect) -> None"},
78937806
{"MoviesTask", (PyCFunction)Qt_MoviesTask, 1,
78947807
"(long maxMilliSecToUse) -> None"},
7895-
{"available", (PyCFunction)Qt_available, 1,
7896-
"Return true if Quicktime is available"},
78977808
{NULL, NULL, 0}
78987809
};
78997810

‎Mac/Modules/qt/qtsupport.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -253,21 +253,6 @@ def outputFreeIt(self, itselfname):
253253
)
254254
functions.append(f)
255255

256-
# Add manual routines for testing quicktime availability
257-
available_body = """
258-
void *ptr;
259-
260-
if ( !PyArg_ParseTuple(_args, "") )
261-
return NULL;
262-
ptr = (void *)&EnterMovies;
263-
return Py_BuildValue("i", ((long)ptr != 0));
264-
"""
265-
266-
f = ManualGenerator("available", available_body)
267-
f.docstring = lambda : "Return true if Quicktime is available"
268-
269-
functions.append(f)
270-
271256

272257
# add the populated lists to the generator groups
273258
# (in a different wordl the scan program would generate this)

0 commit comments

Comments
 (0)