Commit ab974ecb authored by bigben's avatar bigben

Add a checkbox to enable timeshifting in the open network panel

parent 6e8ab4d5
......@@ -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; };
......
......@@ -14,6 +14,6 @@
<integer>2199</integer>
</array>
<key>IBSystem Version</key>
<string>7S215</string>
<string>7W98</string>
</dict>
</plist>
......@@ -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;
......
......@@ -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];
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment