[vlc-commits] macosx/output: simplify header and implementation

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Aug 24 17:58:00 2012 +0200| [a5be2f81a4cc6d5298f4328d7723e2d0f2fe47ef] | committer: Felix Paul Kühne

macosx/output: simplify header and implementation

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

 modules/gui/macosx/open.m   |    4 ++--
 modules/gui/macosx/output.h |    3 +--
 modules/gui/macosx/output.m |   16 +++-------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index b199aaf..385bde5 100644
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -482,10 +482,10 @@ static VLCOpen *_o_sharedMainInstance = nil;
             [o_options addObject: [NSString stringWithFormat:@"stop-time=%li", tempValue]];
         if( [o_output_ckbox state] == NSOnState )
         {
-            NSUInteger count = [[o_sout_options mrl] count];
+            NSUInteger count = [[o_sout_options soutMRL] count];
             for (NSUInteger i = 0 ; i < count ; i++)
             {
-                [o_options addObject: [NSString stringWithString: [[(VLCOutput *)o_sout_options mrl] objectAtIndex: i]]];
+                [o_options addObject: [NSString stringWithString: [[(VLCOutput *)o_sout_options soutMRL] objectAtIndex: i]]];
             }
         }
         if( [o_file_slave_ckbox state] && o_file_slave_path )
diff --git a/modules/gui/macosx/output.h b/modules/gui/macosx/output.h
index 0c0eaba..237267c 100644
--- a/modules/gui/macosx/output.h
+++ b/modules/gui/macosx/output.h
@@ -82,9 +82,8 @@
     NSArray *o_mrl;
     NSString *o_transcode;
 }
+ at property (readwrite, assign) NSArray * soutMRL;
 
-- (void)setMRL:(NSArray *)o_mrl_string;
-- (NSArray *)mrl;
 - (void)setTranscode:(NSString *)o_transcode_string;
 
 - (void)initStrings;
diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m
index f014a12..71cf8c2 100644
--- a/modules/gui/macosx/output.m
+++ b/modules/gui/macosx/output.m
@@ -37,6 +37,7 @@
  * VLCOutput implementation
  *****************************************************************************/
 @implementation VLCOutput
+ at synthesize soutMRL=o_mrl;
 
 - (id)init
 {
@@ -53,17 +54,6 @@
     [super dealloc];
 }
 
-- (void)setMRL:(NSArray *)o_mrl_array
-{
-    [o_mrl autorelease];
-    o_mrl = [o_mrl_array copy];
-}
-
-- (NSArray *)mrl
-{
-    return [o_mrl copy];
-}
-
 - (void)setTranscode:(NSString *)o_transcode_string
 {
     [o_transcode autorelease];
@@ -377,7 +367,7 @@
                                     @":demuxdump-file=%@",
                                     [o_file_field stringValue]],
                                     nil];
-            [self setMRL:o_sout_options];
+            [self setSoutMRL:o_sout_options];
             return;
         }
         else
@@ -480,7 +470,7 @@
         [o_mrl_string appendString: @"}"];
     }
     o_sout_options = [NSArray arrayWithObjects: o_mrl_string,nil];
-    [self setMRL:o_sout_options];
+    [self setSoutMRL:o_sout_options];
 }
 
 - (void)TTLChanged:(NSNotification *)o_notification