Add a checkbox to enable timeshifting in the open network panel

diff --git a/extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib
index 9c7d65854f0ef39a3a5933985951cc7bdd37b770..c7f251fcf87de691a21f3b3b3f18e2004364f8f6 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib
@@ -307,6 +307,7 @@
                 "o_net_http_url" = id; 
                 "o_net_http_url_lbl" = id; 
                 "o_net_mode" = id; 
+                "o_net_timeshift_ckbox" = id; 
                 "o_net_udp_port" = id; 
                 "o_net_udp_port_lbl" = id; 
                 "o_net_udp_port_stp" = id; 
@@ -389,13 +390,7 @@
             }; 
             SUPERCLASS = NSObject; 
         }, 
-        {
-            ACTIONS = {}; 
-            CLASS = VLCPlaylist; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {}; 
-            SUPERCLASS = NSObject; 
-        }, 
+        {CLASS = VLCPlaylist; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
         {CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, 
         {
             ACTIONS = {advancedToggle = id; closePrefs = id; resetAll = id; savePrefs = id; }; 

diff --git a/extras/MacOSX/Resources/English.lproj/Open.nib/info.nib b/extras/MacOSX/Resources/English.lproj/Open.nib/info.nib
index 20967e1de7219bd7f24b66461ce437005f1eab46..9a57db9a2d5ec618102e7bcd5a2c8265224f18ae 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/Open.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/Open.nib/info.nib
@@ -14,6 +14,6 @@
                <integer>2199</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>7S215</string>
+       <string>7W98</string>
 </dict>
 </plist>

diff --git a/extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib
index 27979670dfd8bf249541e20a259bbdff6b55a586..14307a8e2540366c1d82af4e1da72cdd5233db60 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib and b/extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h
index ba23d14c4ad034210307855639da5ce942bbd9c1..1078efb93a322bb192968177aa66ef1d9c4c42aa 100644 (file)
--- a/modules/gui/macosx/open.h
+++ b/modules/gui/macosx/open.h
@@ -69,6 +69,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_net_udpm_port_stp;
     IBOutlet id o_net_http_url;
     IBOutlet id o_net_http_url_lbl;
+    IBOutlet id o_net_timeshift_ckbox;
 
     IBOutlet id o_file_sub_ckbox;
     IBOutlet id o_file_sub_btn_settings;

diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index df1c64c4d85247a2cd764df2e923c44627536e6c..202ec74b4c6e35d0b8060a2029d0eea3581217a6 100644 (file)
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -183,6 +183,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [[o_net_mode cellAtRow:0 column:0] setTitle: _NS("UDP/RTP")];
     [[o_net_mode cellAtRow:1 column:0] setTitle: _NS("UDP/RTP Multicast")];
     [[o_net_mode cellAtRow:2 column:0] setTitle: _NS("HTTP/FTP/MMS/RTSP")];
+    [o_net_timeshift_ckbox setTitle: _NS("Allow timeshifting")];
 
     [o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];
     [o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
@@ -353,6 +354,11 @@ static VLCOpen *_o_sharedMainInstance = nil;
                       [[(VLCOutput *)o_sout_options getMRL] objectAtIndex: i]]];
             }
         }
+        if( [o_net_timeshift_ckbox state] == NSOnState )
+        {
+            [o_options addObject: [NSString stringWithString:
+                                                @"access-filter=timeshift"]];
+        }
         [o_dic setObject: (NSArray *)[o_options copy] forKey: @"ITEM_OPTIONS"];
         [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:NO];
     }
@@ -645,7 +651,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
     o_mode = [[o_net_mode selectedCell] title];
 
-    if( [o_mode isEqualToString: _NS("UDP/RTP")] ) b_udp = TRUE;   
+    if( [o_mode isEqualToString: _NS("UDP/RTP")] ) b_udp = TRUE;
     else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] ) b_udpm = TRUE;
     else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS/RTSP")] ) b_http = TRUE;
 
@@ -718,7 +724,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
         else
             o_mrl_string = o_url;
     }
-
     [o_mrl setStringValue: o_mrl_string];
 }