[vlc-devel] commit: Fix vout window capability name ( Rémi Denis-Courmont )

git version control git at videolan.org
Tue Dec 9 21:53:42 CET 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Tue Dec  9 22:53:19 2008 +0200| [d504bcec2529ed4a995d6b54f49b615eb4a0a89b] | committer: Rémi Denis-Courmont 

Fix vout window capability name

(Now agrees with module_need)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d504bcec2529ed4a995d6b54f49b615eb4a0a89b
---

 modules/gui/maemo/maemo.c            |    2 +-
 modules/gui/qt4/qt4.cpp              |    2 +-
 modules/gui/skins2/src/skin_main.cpp |    2 +-
 src/video_output/vout_intf.c         |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/maemo/maemo.c b/modules/gui/maemo/maemo.c
index adde4e1..0ee0c3e 100644
--- a/modules/gui/maemo/maemo.c
+++ b/modules/gui/maemo/maemo.c
@@ -69,7 +69,7 @@ vlc_module_begin();
     add_shortcut( "maemo" );
 
     add_submodule();
-        set_capability( "vout window", 50 );
+        set_capability( "vout_window", 50 );
         set_callbacks( OpenWindow, CloseWindow );
 vlc_module_end();
 
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 27c5c9c..9646045 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -225,7 +225,7 @@ vlc_module_begin ()
         set_callbacks( OpenDialogs, Close )
 #if 0 /* this is totally broken */
     add_submodule ()
-        set_capability( "vout window", 50 )
+        set_capability( "vout_window", 50 )
         set_callbacks( WindowOpen, WindowClose )
 #endif
 vlc_module_end ()
diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index 6878aea..97f9358 100644
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -490,7 +490,7 @@ vlc_module_begin ()
     add_shortcut( "skins" )
 
     add_submodule ()
-        set_capability( "vout window", 51 )
+        set_capability( "vout_window", 51 )
         set_callbacks( WindowOpen, WindowClose )
 
     add_submodule ()
diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index fd6396c..7716cf1 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -116,7 +116,7 @@ void *vout_RequestWindow( vout_thread_t *p_vout,
     wnd->pos_y = *pi_y_hint;
     vlc_object_attach (wnd, p_vout);
 
-    wnd->module = module_need (wnd, "vout window", 0, 0);
+    wnd->module = module_need (wnd, "vout_window", 0, 0);
     if (wnd->module == NULL)
     {
         msg_Dbg (wnd, "no window provider available");




More information about the vlc-devel mailing list