[vlc-commits] Search child of playlist rather than anywhere

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu May 26 19:22:44 2011 +0300| [b0b4694b61f1da491cd09a24bf56017a2ba1cca6] | committer: Rémi Denis-Courmont

Search child of playlist rather than anywhere

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

 modules/gui/macosx/controls.m                  |    9 ++++-----
 modules/gui/macosx/extended.m                  |    2 +-
 modules/gui/qt4/components/extended_panels.cpp |    4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 2020ad3..a2aab49 100644
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -480,10 +480,9 @@
 
 - (IBAction)telxTransparent:(id)sender
 {
-    intf_thread_t * p_intf = VLCIntf;
     vlc_object_t *p_vbi;
-    p_vbi = (vlc_object_t *) vlc_object_find_name( p_intf,
-                    "zvbi", FIND_ANYWHERE );
+    p_vbi = (vlc_object_t *) vlc_object_find_name( pl_Get( VLCIntf ),
+                    "zvbi", FIND_CHILD );
     if( p_vbi )
     {
         var_SetBool( p_vbi, "vbi-opaque", [sender state] );
@@ -510,8 +509,8 @@
         i_page = 'b' << 16;
     if( i_page == 0 ) return;
 
-    p_vbi = (vlc_object_t *) vlc_object_find_name( p_intf,
-                "zvbi", FIND_ANYWHERE );
+    p_vbi = (vlc_object_t *) vlc_object_find_name( pl_Get( VLCIntf ),
+                "zvbi", FIND_CHILD );
     if( p_vbi )
     {
         var_SetInteger( p_vbi, "vbi-page", i_page );
diff --git a/modules/gui/macosx/extended.m b/modules/gui/macosx/extended.m
index 919fa80..ad187e6 100644
--- a/modules/gui/macosx/extended.m
+++ b/modules/gui/macosx/extended.m
@@ -352,7 +352,7 @@ static VLCExtended *_o_sharedInstance = nil;
     else
     {
         msg_Dbg( p_intf, "we found a vout to adjust, let's look for the filter" );
-        p_filter = vlc_object_find_name( p_intf, "adjust", FIND_ANYWHERE );
+        p_filter = vlc_object_find_name( pl_Get(p_intf), "adjust", FIND_CHILD );
 
         if(! p_filter )
         {
diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 6bb9a7f..41fed07 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -686,7 +686,7 @@ void ExtV4l2::showEvent( QShowEvent *event )
 
 void ExtV4l2::Refresh( void )
 {
-    vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( p_intf, "v4l2", FIND_ANYWHERE );
+    vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( pl_Get(p_intf), "v4l2", FIND_CHILD );
     help->hide();
     if( box )
     {
@@ -830,7 +830,7 @@ void ExtV4l2::ValueChange( bool value )
 void ExtV4l2::ValueChange( int value )
 {
     QObject *s = sender();
-    vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( p_intf, "v4l2", FIND_ANYWHERE );
+    vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( pl_Get(p_intf), "v4l2", FIND_CHILD );
     if( p_obj )
     {
         char *psz_var = strdup( qtu( s->objectName() ) );