rename wxFileList to wxFileListCtrl

[wxWidgets.git] / src / unix / mediactrl.cpp

diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp
index 3aa6a5a3451eea2a50b3ca7a66689a83dfda2cd6..01a553416fef0641a8e85b3d0156f0aa13244baf 100644 (file)
--- a/src/unix/mediactrl.cpp
+++ b/src/unix/mediactrl.cpp
@@ -30,14 +30,15 @@
 
 #ifndef  WX_PRECOMP
     #include "wx/log.h"             // wxLogDebug/wxLogSysError/wxLogTrace
 
 #ifndef  WX_PRECOMP
     #include "wx/log.h"             // wxLogDebug/wxLogSysError/wxLogTrace

+    #include "wx/app.h"             // wxTheApp->argc, wxTheApp->argv
+    #include "wx/timer.h"           // wxTimer

 #endif
 
 #endif
 

-#include "wx/app.h"                 // wxTheApp->argc, wxTheApp->argv

 #include "wx/thread.h"              // wxMutex/wxMutexLocker
 #include "wx/thread.h"              // wxMutex/wxMutexLocker

-#include "wx/timer.h"               // wxTimer

 
 #ifdef __WXGTK__
 
 #ifdef __WXGTK__

-#    include "wx/gtk/win_gtk.h"     // for <gdk/gdkx.h>/GDK_WINDOW_XWINDOW
+#    include "wx/gtk/win_gtk.h"
+#    include <gdk/gdkx.h>           // for GDK_WINDOW_XWINDOW

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -144,8 +145,10 @@
 #      define DEBUG_MAIN_THREAD
 #   endif // Debug
 
 #      define DEBUG_MAIN_THREAD
 #   endif // Debug
 

+#ifndef __WXGTK20__

 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;

+#endif

 extern bool g_mainThreadLocked;
 #endif // wxGTK
 
 extern bool g_mainThreadLocked;
 #endif // wxGTK
 


@@ -165,7 +168,7 @@ class WXDLLIMPEXP_MEDIA
 public:
 
     wxGStreamerMediaBackend();
 public:
 
     wxGStreamerMediaBackend();

-    ~wxGStreamerMediaBackend();
+    virtual ~wxGStreamerMediaBackend();

 
     virtual bool CreateControl(wxControl* ctrl, wxWindow* parent,
                                      wxWindowID id,
 
     virtual bool CreateControl(wxControl* ctrl, wxWindow* parent,
                                      wxWindowID id,


@@ -322,8 +325,10 @@ static gint gtk_window_realize_callback(GtkWidget* theWidget,
 {
     DEBUG_MAIN_THREAD // TODO: Is this neccessary?
 
 {
     DEBUG_MAIN_THREAD // TODO: Is this neccessary?
 

+#ifndef __WXGTK20__

     if (g_isIdle)   // FIXME: Why is needed? For wxYield? ??
         wxapp_install_idle_handler();
     if (g_isIdle)   // FIXME: Why is needed? For wxYield? ??
         wxapp_install_idle_handler();

+#endif

 
     wxYield();    // FIXME: RN: X Server gets an error/crash if I don't do
                   //       this or a messagebox beforehand?!?!??
 
     wxYield();    // FIXME: RN: X Server gets an error/crash if I don't do
                   //       this or a messagebox beforehand?!?!??


@@ -912,7 +917,7 @@ bool wxGStreamerMediaBackend::TryVideoSink(GstElement* videosink)
 //
 // Called when the media is about to stop
 //-----------------------------------------------------------------------------
 //
 // Called when the media is about to stop
 //-----------------------------------------------------------------------------

-void wxGStreamerMediaEventHandler::OnMediaFinish(wxMediaEvent& event)
+void wxGStreamerMediaEventHandler::OnMediaFinish(wxMediaEvent& WXUNUSED(event))

 {
     // (RN - I have no idea why I thought this was good behaviour....
     // maybe it made sense for streaming/nonseeking data but
 {
     // (RN - I have no idea why I thought this was good behaviour....
     // maybe it made sense for streaming/nonseeking data but


@@ -1070,9 +1075,6 @@ bool wxGStreamerMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
     // so it doesn't draw over the video and cause sporadic
     // disappearances of the video
     gtk_widget_set_double_buffered(m_ctrl->m_wxwindow, FALSE);
     // so it doesn't draw over the video and cause sporadic
     // disappearances of the video
     gtk_widget_set_double_buffered(m_ctrl->m_wxwindow, FALSE);

-
-    // Tell GtkPizza not to clear the background
-    gtk_pizza_set_clear(GTK_PIZZA(m_ctrl->m_wxwindow), FALSE);

 #endif
 
     // don't erase the background of our control window
 #endif
 
     // don't erase the background of our control window


@@ -1238,6 +1240,9 @@ bool wxGStreamerMediaBackend::DoLoad(const wxString& locstring)
             return false;
     }
 
             return false;
     }
 

+    // free current media resources
+    gst_element_set_state (m_playbin, GST_STATE_NULL);
+

     // Make sure the passed URI is valid and tell playbin to load it
     // non-file uris are encoded
     wxASSERT(gst_uri_protocol_is_valid("file"));
     // Make sure the passed URI is valid and tell playbin to load it
     // non-file uris are encoded
     wxASSERT(gst_uri_protocol_is_valid("file"));