X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0da55f82bb35044dc049ba36005b0d474c3b6da8..2028c33ab5a39a12bd410ac953731a56ad6377ba:/src/unix/mediactrl.cpp diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp index 2a333c3818..0fbf87aa14 100644 --- a/src/unix/mediactrl.cpp +++ b/src/unix/mediactrl.cpp @@ -160,6 +160,10 @@ public: virtual bool Load(const wxString& fileName); virtual bool Load(const wxURI& location); + virtual bool Load(const wxURI& location, + const wxURI& proxy) + { return wxMediaBackendCommonBase::Load(location, proxy); } + virtual wxMediaState GetState(); @@ -300,7 +304,7 @@ static gint gtk_window_realize_callback(GtkWidget* widget, wxGStreamerMediaBackend* be) { gdk_flush(); - + GdkWindow *window = widget->window; wxASSERT(window); @@ -345,7 +349,7 @@ static void gst_state_change_callback(GstElement *play, // Called by gstreamer when the media is done playing ("end of stream") //----------------------------------------------------------------------------- extern "C" { -static void gst_finish_callback(GstElement *play, +static void gst_finish_callback(GstElement *WXUNUSED(play), wxGStreamerMediaBackend* be) { wxLogTrace(wxTRACE_GStreamer, wxT("gst_finish_callback")); @@ -362,11 +366,11 @@ static void gst_finish_callback(GstElement *play, // on the command line as well for those who want extra traces. //----------------------------------------------------------------------------- extern "C" { -static void gst_error_callback(GstElement *play, - GstElement *src, +static void gst_error_callback(GstElement *WXUNUSED(play), + GstElement *WXUNUSED(src), GError *err, gchar *debug, - wxGStreamerMediaBackend* be) + wxGStreamerMediaBackend* WXUNUSED(be)) { wxString sError; sError.Printf(wxT("gst_error_callback\n") @@ -388,7 +392,7 @@ static void gst_error_callback(GstElement *play, //----------------------------------------------------------------------------- extern "C" { static void gst_notify_caps_callback(GstPad* pad, - GParamSpec* pspec, + GParamSpec* WXUNUSED(pspec), wxGStreamerMediaBackend* be) { wxLogTrace(wxTRACE_GStreamer, wxT("gst_notify_caps_callback")); @@ -410,8 +414,8 @@ static void gst_notify_caps_callback(GstPad* pad, //----------------------------------------------------------------------------- #if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10 extern "C" { -static void gst_notify_stream_info_callback(GstElement* element, - GParamSpec* pspec, +static void gst_notify_stream_info_callback(GstElement* WXUNUSED(element), + GParamSpec* WXUNUSED(pspec), wxGStreamerMediaBackend* be) { wxLogTrace(wxTRACE_GStreamer, wxT("gst_notify_stream_info_callback")); @@ -461,7 +465,7 @@ static void gst_desired_size_changed_callback(GstElement * play, //----------------------------------------------------------------------------- #if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10 extern "C" { -static gboolean gst_bus_async_callback(GstBus* bus, +static gboolean gst_bus_async_callback(GstBus* WXUNUSED(bus), GstMessage* message, wxGStreamerMediaBackend* be) { @@ -705,7 +709,7 @@ void wxGStreamerMediaBackend::SetupXOverlay() else { gdk_flush(); - + GdkWindow *window = m_ctrl->m_wxwindow->window; wxASSERT(window); #endif @@ -1433,7 +1437,10 @@ wxLongLong wxGStreamerMediaBackend::GetDuration() // Called when the window is moved - GStreamer takes care of this // for us so nothing is needed //----------------------------------------------------------------------------- -void wxGStreamerMediaBackend::Move(int x, int y, int w, int h) +void wxGStreamerMediaBackend::Move(int WXUNUSED(x), + int WXUNUSED(y), + int WXUNUSED(w), + int WXUNUSED(h)) { } @@ -1491,6 +1498,8 @@ bool wxGStreamerMediaBackend::SetPlaybackRate(double dRate) m_dRate = dRate; return true; } +#else + wxUnusedVar(dRate); #endif #endif