X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7449af7300c1a1f105caefdb0e77553b1d682bf9..bc50a2ae95f2ab36b16ceedc7902a9cbfb2f70ea:/wxPython/src/msw/media_wrap.cpp

diff --git a/wxPython/src/msw/media_wrap.cpp b/wxPython/src/msw/media_wrap.cpp
index f0af56623a..5420bc66fe 100644
--- a/wxPython/src/msw/media_wrap.cpp
+++ b/wxPython/src/msw/media_wrap.cpp
@@ -1477,54 +1477,53 @@ SWIG_Python_SetModule(swig_module_info *swig_module) {
 #define SWIGTYPE_p_wxLayoutConstraints swig_types[43]
 #define SWIGTYPE_p_wxMaximizeEvent swig_types[44]
 #define SWIGTYPE_p_wxMediaCtrl swig_types[45]
-#define SWIGTYPE_p_wxMediaCtrlPlayerControls swig_types[46]
-#define SWIGTYPE_p_wxMediaEvent swig_types[47]
-#define SWIGTYPE_p_wxMenu swig_types[48]
-#define SWIGTYPE_p_wxMenuBar swig_types[49]
-#define SWIGTYPE_p_wxMenuEvent swig_types[50]
-#define SWIGTYPE_p_wxMenuItem swig_types[51]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[52]
-#define SWIGTYPE_p_wxMouseEvent swig_types[53]
-#define SWIGTYPE_p_wxMoveEvent swig_types[54]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[55]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[56]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[57]
-#define SWIGTYPE_p_wxObject swig_types[58]
-#define SWIGTYPE_p_wxPCXHandler swig_types[59]
-#define SWIGTYPE_p_wxPNGHandler swig_types[60]
-#define SWIGTYPE_p_wxPNMHandler swig_types[61]
-#define SWIGTYPE_p_wxPaintEvent swig_types[62]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[63]
-#define SWIGTYPE_p_wxPaperSize swig_types[64]
-#define SWIGTYPE_p_wxPyApp swig_types[65]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[66]
-#define SWIGTYPE_p_wxPyEvent swig_types[67]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[68]
-#define SWIGTYPE_p_wxPySizer swig_types[69]
-#define SWIGTYPE_p_wxPyValidator swig_types[70]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[71]
-#define SWIGTYPE_p_wxScrollEvent swig_types[72]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[73]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[74]
-#define SWIGTYPE_p_wxShowEvent swig_types[75]
-#define SWIGTYPE_p_wxSizeEvent swig_types[76]
-#define SWIGTYPE_p_wxSizer swig_types[77]
-#define SWIGTYPE_p_wxSizerItem swig_types[78]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[79]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[80]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[81]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[82]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[83]
-#define SWIGTYPE_p_wxValidator swig_types[84]
-#define SWIGTYPE_p_wxWindow swig_types[85]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[86]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[87]
-#define SWIGTYPE_p_wxXPMHandler swig_types[88]
-#define SWIGTYPE_ptrdiff_t swig_types[89]
-#define SWIGTYPE_std__ptrdiff_t swig_types[90]
-#define SWIGTYPE_unsigned_int swig_types[91]
-static swig_type_info *swig_types[93];
-static swig_module_info swig_module = {swig_types, 92, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxMediaEvent swig_types[46]
+#define SWIGTYPE_p_wxMenu swig_types[47]
+#define SWIGTYPE_p_wxMenuBar swig_types[48]
+#define SWIGTYPE_p_wxMenuEvent swig_types[49]
+#define SWIGTYPE_p_wxMenuItem swig_types[50]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[51]
+#define SWIGTYPE_p_wxMouseEvent swig_types[52]
+#define SWIGTYPE_p_wxMoveEvent swig_types[53]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[54]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[55]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[56]
+#define SWIGTYPE_p_wxObject swig_types[57]
+#define SWIGTYPE_p_wxPCXHandler swig_types[58]
+#define SWIGTYPE_p_wxPNGHandler swig_types[59]
+#define SWIGTYPE_p_wxPNMHandler swig_types[60]
+#define SWIGTYPE_p_wxPaintEvent swig_types[61]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[62]
+#define SWIGTYPE_p_wxPaperSize swig_types[63]
+#define SWIGTYPE_p_wxPyApp swig_types[64]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[65]
+#define SWIGTYPE_p_wxPyEvent swig_types[66]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[67]
+#define SWIGTYPE_p_wxPySizer swig_types[68]
+#define SWIGTYPE_p_wxPyValidator swig_types[69]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[70]
+#define SWIGTYPE_p_wxScrollEvent swig_types[71]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[72]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[73]
+#define SWIGTYPE_p_wxShowEvent swig_types[74]
+#define SWIGTYPE_p_wxSizeEvent swig_types[75]
+#define SWIGTYPE_p_wxSizer swig_types[76]
+#define SWIGTYPE_p_wxSizerItem swig_types[77]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[78]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[79]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[80]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[81]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[82]
+#define SWIGTYPE_p_wxValidator swig_types[83]
+#define SWIGTYPE_p_wxWindow swig_types[84]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[85]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[86]
+#define SWIGTYPE_p_wxXPMHandler swig_types[87]
+#define SWIGTYPE_ptrdiff_t swig_types[88]
+#define SWIGTYPE_std__ptrdiff_t swig_types[89]
+#define SWIGTYPE_unsigned_int swig_types[90]
+static swig_type_info *swig_types[92];
+static swig_module_info swig_module = {swig_types, 91, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1561,7 +1560,12 @@ enum wxMediaCtrlPlayerControls
     wxMEDIACTRLPLAYERCONTROLS_DEFAULT
 };
 
-    
+static wxString wxMEDIABACKEND_DIRECTSHOW(wxEmptyString);
+static wxString wxMEDIABACKEND_MCI       (wxEmptyString);
+static wxString wxMEDIABACKEND_QUICKTIME (wxEmptyString);
+static wxString wxMEDIABACKEND_GSTREAMER (wxEmptyString);
+
+
 class wxMediaEvent : public wxNotifyEvent
 {
 public:
@@ -1625,10 +1629,14 @@ const wxEventType wxEVT_MEDIA_LOADED = 0;
 #endif
 
 
-  /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
+  /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
 #define SWIG_From_int PyInt_FromLong
 /*@@*/
 
+ static const wxString wxPyMEDIABACKEND_DIRECTSHOW(wxMEDIABACKEND_DIRECTSHOW); 
+ static const wxString wxPyMEDIABACKEND_MCI(wxMEDIABACKEND_MCI); 
+ static const wxString wxPyMEDIABACKEND_QUICKTIME(wxMEDIABACKEND_QUICKTIME); 
+ static const wxString wxPyMEDIABACKEND_GSTREAMER(wxMEDIABACKEND_GSTREAMER); 
 
 #include <limits.h>
 
@@ -1664,7 +1672,7 @@ SWIG_AsVal_long(PyObject* obj, long* val)
         return 1;
     }
     else {
-        SWIG_type_error("number", obj);
+        SWIG_Python_TypeError("number", obj);
     }
     return 0;
 }
@@ -1744,7 +1752,7 @@ SWIG_Check_long(PyObject* obj)
 }
 
 
-  /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
+  /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/
 #define SWIG_From_double PyFloat_FromDouble
 /*@@*/
 
@@ -1757,7 +1765,7 @@ SWIG_AsVal_double(PyObject *obj, double* val)
         return 1;
     }
     else {
-        SWIG_type_error("number", obj);
+        SWIG_Python_TypeError("number", obj);
     }
     return 0;
 }
@@ -1786,6 +1794,86 @@ SWIG_Check_double(PyObject* obj)
 #ifdef __cplusplus
 extern "C" {
 #endif
+static int _wrap_MEDIABACKEND_DIRECTSHOW_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable MEDIABACKEND_DIRECTSHOW is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_MEDIABACKEND_DIRECTSHOW_get(void) {
+    PyObject *pyobj = NULL;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyMEDIABACKEND_DIRECTSHOW)->c_str(), (&wxPyMEDIABACKEND_DIRECTSHOW)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyMEDIABACKEND_DIRECTSHOW)->c_str(), (&wxPyMEDIABACKEND_DIRECTSHOW)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
+static int _wrap_MEDIABACKEND_MCI_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable MEDIABACKEND_MCI is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_MEDIABACKEND_MCI_get(void) {
+    PyObject *pyobj = NULL;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyMEDIABACKEND_MCI)->c_str(), (&wxPyMEDIABACKEND_MCI)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyMEDIABACKEND_MCI)->c_str(), (&wxPyMEDIABACKEND_MCI)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
+static int _wrap_MEDIABACKEND_QUICKTIME_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable MEDIABACKEND_QUICKTIME is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_MEDIABACKEND_QUICKTIME_get(void) {
+    PyObject *pyobj = NULL;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyMEDIABACKEND_QUICKTIME)->c_str(), (&wxPyMEDIABACKEND_QUICKTIME)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyMEDIABACKEND_QUICKTIME)->c_str(), (&wxPyMEDIABACKEND_QUICKTIME)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
+static int _wrap_MEDIABACKEND_GSTREAMER_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable MEDIABACKEND_GSTREAMER is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_MEDIABACKEND_GSTREAMER_get(void) {
+    PyObject *pyobj = NULL;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyMEDIABACKEND_GSTREAMER)->c_str(), (&wxPyMEDIABACKEND_GSTREAMER)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyMEDIABACKEND_GSTREAMER)->c_str(), (&wxPyMEDIABACKEND_GSTREAMER)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
 static PyObject *_wrap_new_MediaEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj = NULL;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
@@ -2504,14 +2592,8 @@ static PyObject *_wrap_MediaCtrl_ShowPlayerControls(PyObject *, PyObject *args,
     if (SWIG_arg_fail(1)) SWIG_fail;
     if (obj1) {
         {
-            wxMediaCtrlPlayerControls * argp;
-            SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxMediaCtrlPlayerControls, SWIG_POINTER_EXCEPTION);
-            if (SWIG_arg_fail(2)) SWIG_fail;
-            if (argp == NULL) {
-                SWIG_null_ref("wxMediaCtrlPlayerControls");
-            }
+            arg2 = static_cast<wxMediaCtrlPlayerControls >(SWIG_As_int(obj1)); 
             if (SWIG_arg_fail(2)) SWIG_fail;
-            arg2 = *argp;
         }
     }
     {
@@ -3191,7 +3273,6 @@ static swig_type_info _swigt__p_wxPyValidator = {"_p_wxPyValidator", 0, 0, 0, 0}
 static swig_type_info _swigt__p_wxMenu = {"_p_wxMenu", 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxFileOffset = {"_p_wxFileOffset", "wxFileOffset *", 0, 0, 0};
 static swig_type_info _swigt__p_wxMediaCtrl = {"_p_wxMediaCtrl", "wxMediaCtrl *", 0, 0, 0};
-static swig_type_info _swigt__p_wxMediaCtrlPlayerControls = {"_p_wxMediaCtrlPlayerControls", "wxMediaCtrlPlayerControls *", 0, 0, 0};
 static swig_type_info _swigt__p_wxMediaEvent = {"_p_wxMediaEvent", "wxMediaEvent *", 0, 0, 0};
 static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", "wxNotifyEvent *", 0, 0, 0};
 static swig_type_info _swigt__p_wxObject = {"_p_wxObject", "wxObject *", 0, 0, 0};
@@ -3279,7 +3360,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxLayoutConstraints,
   &_swigt__p_wxMaximizeEvent,
   &_swigt__p_wxMediaCtrl,
-  &_swigt__p_wxMediaCtrlPlayerControls,
   &_swigt__p_wxMediaEvent,
   &_swigt__p_wxMenu,
   &_swigt__p_wxMenuBar,
@@ -3379,7 +3459,6 @@ static swig_cast_info _swigc__p_wxMenu[] = {{&_swigt__p_wxMenu, 0, 0, 0},{0, 0,
 static swig_cast_info _swigc__p_wxEvtHandler[] = {  {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxEvtHandler, 0, 0, 0},  {&_swigt__p_wxMediaCtrl, _p_wxMediaCtrlTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFileOffset[] = {  {&_swigt__p_wxFileOffset, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMediaCtrl[] = {  {&_swigt__p_wxMediaCtrl, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_wxMediaCtrlPlayerControls[] = {  {&_swigt__p_wxMediaCtrlPlayerControls, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMediaEvent[] = {  {&_swigt__p_wxMediaEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNotifyEvent[] = {  {&_swigt__p_wxNotifyEvent, 0, 0, 0},  {&_swigt__p_wxMediaEvent, _p_wxMediaEventTo_p_wxNotifyEvent, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxLayoutConstraints[] = {{&_swigt__p_wxLayoutConstraints, 0, 0, 0},{0, 0, 0, 0}};
@@ -3467,7 +3546,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxLayoutConstraints,
   _swigc__p_wxMaximizeEvent,
   _swigc__p_wxMediaCtrl,
-  _swigc__p_wxMediaCtrlPlayerControls,
   _swigc__p_wxMediaEvent,
   _swigc__p_wxMenu,
   _swigc__p_wxMenuBar,
@@ -4019,7 +4097,23 @@ SWIGEXPORT void SWIG_init(void) {
     {
         PyDict_SetItemString(d,"MEDIASTATE_PLAYING", SWIG_From_int(static_cast<int >(wxMEDIASTATE_PLAYING))); 
     }
+    {
+        PyDict_SetItemString(d,"MEDIACTRLPLAYERCONTROLS_NONE", SWIG_From_int(static_cast<int >(wxMEDIACTRLPLAYERCONTROLS_NONE))); 
+    }
+    {
+        PyDict_SetItemString(d,"MEDIACTRLPLAYERCONTROLS_STEP", SWIG_From_int(static_cast<int >(wxMEDIACTRLPLAYERCONTROLS_STEP))); 
+    }
+    {
+        PyDict_SetItemString(d,"MEDIACTRLPLAYERCONTROLS_VOLUME", SWIG_From_int(static_cast<int >(wxMEDIACTRLPLAYERCONTROLS_VOLUME))); 
+    }
+    {
+        PyDict_SetItemString(d,"MEDIACTRLPLAYERCONTROLS_DEFAULT", SWIG_From_int(static_cast<int >(wxMEDIACTRLPLAYERCONTROLS_DEFAULT))); 
+    }
     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
+    SWIG_addvarlink(SWIG_globals,(char*)"MEDIABACKEND_DIRECTSHOW",_wrap_MEDIABACKEND_DIRECTSHOW_get, _wrap_MEDIABACKEND_DIRECTSHOW_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"MEDIABACKEND_MCI",_wrap_MEDIABACKEND_MCI_get, _wrap_MEDIABACKEND_MCI_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"MEDIABACKEND_QUICKTIME",_wrap_MEDIABACKEND_QUICKTIME_get, _wrap_MEDIABACKEND_QUICKTIME_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"MEDIABACKEND_GSTREAMER",_wrap_MEDIABACKEND_GSTREAMER_get, _wrap_MEDIABACKEND_GSTREAMER_set);
     SWIG_addvarlink(SWIG_globals,(char*)"MediaCtrlNameStr",_wrap_MediaCtrlNameStr_get, _wrap_MediaCtrlNameStr_set);
     PyDict_SetItemString(d, "wxEVT_MEDIA_FINISHED", PyInt_FromLong(wxEVT_MEDIA_FINISHED));
     PyDict_SetItemString(d, "wxEVT_MEDIA_STOP", PyInt_FromLong(wxEVT_MEDIA_STOP));