macosx: Get rid of the vlc_object_find().

diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m
index 527a7cc4cc61a1590b4331c78c60fc2869841d77..48e54e16951c25a73ccb1126338fea233156230e 100644 (file)
--- a/modules/gui/macosx/embeddedwindow.m
+++ b/modules/gui/macosx/embeddedwindow.m
@@ -388,7 +388,7 @@
     NSScreen *screen;
     NSRect screen_rect;
     NSRect rect;
-    vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+    vout_thread_t *p_vout = getVout();
     BOOL blackout_other_displays = config_GetInt( VLCIntf, "macosx-black" );
 
     screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)var_GetInteger( p_vout, "video-device" )]; 

diff --git a/modules/gui/macosx/equalizer.m b/modules/gui/macosx/equalizer.m
index 52a81efe56f4b902ece419e7cb79afb80806342c..fb5e52ca3e725e01f200bcd21ad29be7f2c38950 100644 (file)
--- a/modules/gui/macosx/equalizer.m
+++ b/modules/gui/macosx/equalizer.m
@@ -49,9 +49,8 @@ static void ChangeFiltersString( intf_thread_t *p_intf,
 {
     char *psz_parser, *psz_string;
     int i;
-    vlc_object_t *p_object = vlc_object_find( p_intf,
-                                VLC_OBJECT_AOUT, FIND_ANYWHERE );
-    aout_instance_t *p_aout = (aout_instance_t *)p_object;
+    aout_instance_t *p_aout = getAout();
+    vlc_object_t *p_object = VLC_OBJECT(p_aout);
     if( !p_object )
     {
         p_object = (vlc_object_t *)pl_Hold( p_intf );
@@ -115,8 +114,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
                                  char *psz_name )
 {
     char *psz_parser, *psz_string;
-    vlc_object_t *p_object = vlc_object_find( p_intf,
-                                VLC_OBJECT_AOUT, FIND_ANYWHERE );
+    vlc_object_t *p_object = VLC_OBJECT(getAout());
     if( p_object == NULL )
         p_object = (vlc_object_t *)pl_Hold( p_intf );
 
@@ -171,8 +169,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
     bool b_2p;
     int i;
     bool b_enabled = GetFiltersStatus( p_intf, (char *)"equalizer" );
-    vlc_object_t *p_object = vlc_object_find( p_intf,
-                                              VLC_OBJECT_AOUT, FIND_ANYWHERE );
+    vlc_object_t *p_object = VLC_OBJECT(getAout());
 
     if( p_object == NULL )
         p_object = (vlc_object_t *)pl_Hold( p_intf );
@@ -227,8 +224,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
 - (IBAction)bandSliderUpdated:(id)sender
 {
     intf_thread_t *p_intf = VLCIntf;
-    vlc_object_t *p_object = vlc_object_find( p_intf,
-                                              VLC_OBJECT_AOUT, FIND_ANYWHERE );
+    vlc_object_t *p_object = VLC_OBJECT(getAout());
 
     if( p_object == NULL )
         p_object = (vlc_object_t *)pl_Hold( p_intf );
@@ -264,8 +260,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
 {
     intf_thread_t *p_intf = VLCIntf;
     int i;
-    vlc_object_t *p_object= vlc_object_find( p_intf,
-                                             VLC_OBJECT_AOUT, FIND_ANYWHERE );
+    vlc_object_t *p_object= VLC_OBJECT(getAout());
     if( p_object == NULL )
         p_object = (vlc_object_t *)pl_Hold( p_intf );
 
@@ -309,8 +304,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
     intf_thread_t *p_intf = VLCIntf;
     float f_preamp = [sender floatValue] ;
 
-    vlc_object_t *p_object = vlc_object_find( p_intf,
-                                              VLC_OBJECT_AOUT, FIND_ANYWHERE );
+    vlc_object_t *p_object = VLC_OBJECT(getAout());
     if( p_object == NULL )
         p_object = (vlc_object_t *)pl_Hold( p_intf );
 
@@ -348,9 +342,8 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
 {
     intf_thread_t *p_intf = VLCIntf;
     bool b_2p = [sender state] ? true : false;
-    vlc_object_t *p_object= vlc_object_find( p_intf,
-                                             VLC_OBJECT_AOUT, FIND_ANYWHERE );
-    aout_instance_t *p_aout = (aout_instance_t *)p_object;
+    aout_instance_t *p_aout = getAout();
+    vlc_object_t *p_object= VLC_OBJECT(p_aout);
     if( p_object == NULL )
         p_object = (vlc_object_t *)pl_Hold( p_intf );
 
@@ -376,8 +369,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
 - (void)awakeFromNib
 {
     int i;
-    vlc_object_t *p_object= vlc_object_find( VLCIntf,
-                                             VLC_OBJECT_AOUT, FIND_ANYWHERE );
+    vlc_object_t *p_object= VLC_OBJECT(getAout());
     if( p_object == NULL )
         p_object = (vlc_object_t *)pl_Hold( VLCIntf );
 

diff --git a/modules/gui/macosx/extended.m b/modules/gui/macosx/extended.m
index 19e5d4926a99ceb2a4182bb4f9aa18b0eadaddc7..34ebe19f21e1e529015d615e182237674f2d338a 100644 (file)
--- a/modules/gui/macosx/extended.m
+++ b/modules/gui/macosx/extended.m
@@ -31,6 +31,7 @@
 #import <vlc_aout.h>
 #import <vlc_vout.h>
 #import <vlc_interface.h>
+#import <vlc_playlist.h>
 
 /*****************************************************************************
  * VLCExtended implementation
@@ -108,7 +109,7 @@ static VLCExtended *_o_sharedInstance = nil;
     /* set the adjust-filter-sliders to the values from the prefs and enable
      * them, if wanted */
     char * psz_vfilters;
-    intf_thread_t * p_intf = VLCIntf;
+    intf_thread_t *p_intf = VLCIntf;
     psz_vfilters = config_GetPsz( p_intf, "vout-filter" );
     /* set the video-filter-checkboxes to the correct values */
     if( psz_vfilters )
@@ -322,7 +323,7 @@ static VLCExtended *_o_sharedInstance = nil;
 {
     /* read-out the sliders' values and apply them */
     intf_thread_t * p_intf = VLCIntf;
-    vout_thread_t *p_vout = (vout_thread_t *)vlc_object_find(p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE);
+    vout_thread_t *p_vout = getVout();
     vlc_object_t *p_filter;
 
     if( p_vout == NULL )
@@ -356,7 +357,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_t *)vlc_object_find_name( p_intf, "adjust", FIND_ANYWHERE );
+        p_filter = vlc_object_find_name( p_intf, "adjust", FIND_ANYWHERE );
 
         if(! p_filter )
         {
@@ -409,7 +410,7 @@ static VLCExtended *_o_sharedInstance = nil;
     NSArray *o_windows = [NSApp orderedWindows];
     NSEnumerator *o_enumerator = [o_windows objectEnumerator];
     playlist_t * p_playlist = pl_Hold( VLCIntf );
-    vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+    vout_thread_t *p_vout = getVout();
     vout_thread_t *p_real_vout;
 
     val.f_float = [o_sld_opaque floatValue] / 100;
@@ -453,7 +454,7 @@ static VLCExtended *_o_sharedInstance = nil;
 {
     /* read-out the slider's value and apply it */
     intf_thread_t * p_intf = VLCIntf;
-    aout_instance_t * p_aout= (aout_instance_t *)vlc_object_find(p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE);
+    aout_instance_t * p_aout= getAout();
 
     if( p_aout != NULL )
     {
@@ -592,8 +593,7 @@ static VLCExtended *_o_sharedInstance = nil;
     config_PutPsz( p_intf, "vout-filter", psz_string );
 
     /* Try to set on the fly */
-    p_vout = (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT,
-                                              FIND_ANYWHERE );
+    p_vout = getVout();
     if( p_vout )
     {
         var_SetString( p_vout, "vout-filter", psz_string );
@@ -659,8 +659,7 @@ static VLCExtended *_o_sharedInstance = nil;
     config_PutPsz( p_intf, "video-filter", psz_string );
 
     /* Try to set on the fly */
-    p_vout = (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT,
-                                              FIND_ANYWHERE );
+    p_vout = getVout();
     if( p_vout )
     {
         var_SetString( p_vout, "video-filter", psz_string );
@@ -679,8 +678,7 @@ static VLCExtended *_o_sharedInstance = nil;
 
     char *psz_parser, *psz_string;
     intf_thread_t * p_intf = VLCIntf;
-    aout_instance_t * p_aout= (aout_instance_t *)vlc_object_find(p_intf,
-                                 VLC_OBJECT_AOUT, FIND_ANYWHERE);
+    aout_instance_t * p_aout = getAout();
 
     if( p_aout )
     {
@@ -737,14 +735,7 @@ static VLCExtended *_o_sharedInstance = nil;
     }
     else
     {
-        var_SetString( p_aout, "audio-filter", psz_string );
-        int i = 0;
-        while( i < p_aout->i_nb_inputs )
-        {
-            p_aout->pp_inputs[i]->b_restart = true;
-            i = (i + 1);
-        }
-        vlc_object_release( p_aout );
+        aout_EnableFilter( p_aout, psz_string, false );
     }
     free( psz_string );
 

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 0f4a5706ee49488d05ae157d8167c835648feef2..6a1d4823a7a25a45a63db3d8dd3b642918c88816 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -54,6 +54,12 @@ unsigned int CocoaKeyToVLC( unichar i_key );
             @"/System/Library/CoreServices/SystemVersion.plist"] \
             objectForKey: @"ProductVersion"] floatValue]
 
+
+// You need to release those objects after use
+input_thread_t *getInput(void);
+vout_thread_t *getVout(void);
+aout_instance_t *getAout(void);
+
 /*****************************************************************************
  * intf_sys_t: description and status of the interface
  *****************************************************************************/

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 8fa72fd580a730a69061838612a8097ec2f109c5..cd7ef65256f267d1654023633ae82673e8d00824 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -278,6 +278,34 @@ bool checkProgressPanel (void *priv)
     [o_pool release];
 }
 
+#pragma mark -
+#pragma mark Helpers
+
+input_thread_t *getInput(void)
+{
+    intf_thread_t *p_intf = VLCIntf;
+    playlist_t *p_playlist = pl_Hold(p_intf);
+    input_thread_t *p_input = pl_CurrentInput(p_playlist);
+    pl_Release(p_playlist);
+    return p_input;
+}
+
+vout_thread_t *getVout(void)
+{
+    input_thread_t *p_input = getInput();
+    vout_thread_t *p_vout = input_GetVout(p_input);
+    vlc_object_release(p_input);
+    return p_vout;
+}
+
+aout_instance_t *getAout(void)
+{
+    input_thread_t *p_input = getInput();
+    aout_instance_t *p_aout = input_GetAout(p_input);
+    vlc_object_release(p_input);
+    return p_aout;
+}
+
 #pragma mark -
 #pragma mark Private
 
@@ -1935,11 +1963,9 @@ end:
 
 - (void)refreshVoutDeviceMenu:(NSNotification *)o_notification
 {
-    int x,y = 0;
-    vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
-                                              FIND_ANYWHERE );
- 
-    if(! p_vout )
+    int x, y = 0;
+    vout_thread_t * p_vout = getVout();
+    if( !p_vout )
         return;
  
     /* clean the menu before adding new entries */

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index ba9c7d71fa59eed37d6d2b714ff1aac6b42125c7..7ac8367fd26c4121c13b445f22a2a6607e0f6767 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -290,7 +290,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 
     if( !p_vout ) return;
 
-    p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT );
+    p_input = getInput();
 
     if( !p_input ) return;