From: Derk-Jan Hartman Date: Sun, 22 Feb 2009 19:50:51 +0000 (+0100) Subject: Remove access-filter timeshift from OSX open dialog. X-Git-Tag: 1.0.0-pre1~484 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=87bbbc4566297bba76f2692f855d099dd52f6027;p=vlc Remove access-filter timeshift from OSX open dialog. --- diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib index bbd15034ea..9e712a84e4 100644 --- a/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib +++ b/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib @@ -1,212 +1,536 @@ -{ - IBClasses = ( - { - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - eyetvGetPlugin = id; - eyetvLaunch = id; - eyetvSwitchChannel = id; - openCaptureModeChanged = id; - openDisc = id; - openDiscMenusChanged = id; - openDiscStepperChanged = id; - openDiscTypeChanged = id; - openFile = id; - openFileBrowse = id; - openFileGeneric = id; - openFileStreamChanged = id; - openNet = id; - openNetModeChanged = id; - openNetStepperChanged = id; - openVTSBrowse = id; - panelCancel = id; - panelOk = id; - screenStepperChanged = id; - subCloseSheet = id; - subDelayStepperChanged = id; - subFileBrowse = id; - subFpsStepperChanged = id; - subOverride = id; - subSettings = id; - subsChanged = id; - }; - CLASS = VLCOpen; - LANGUAGE = ObjC; - OUTLETS = { - "o_btn_cancel" = id; - "o_btn_ok" = id; - "o_capture_label_view" = id; - "o_capture_lbl" = id; - "o_capture_long_lbl" = id; - "o_capture_mode_pop" = id; - "o_disc_chapter" = id; - "o_disc_chapter_lbl" = id; - "o_disc_chapter_stp" = id; - "o_disc_device" = id; - "o_disc_device_lbl" = id; - "o_disc_dvd_menus" = id; - "o_disc_title" = id; - "o_disc_title_lbl" = id; - "o_disc_title_stp" = id; - "o_disc_type" = id; - "o_disc_videots_btn_browse" = id; - "o_disc_videots_folder" = id; - "o_eyetv_channels_pop" = id; - "o_eyetv_chn_bgbar" = id; - "o_eyetv_chn_status_txt" = id; - "o_eyetv_currentChannel_lbl" = id; - "o_eyetv_getPlugin_btn" = id; - "o_eyetv_launchEyeTV_btn" = id; - "o_eyetv_nextProgram_btn" = id; - "o_eyetv_noInstanceLong_lbl" = id; - "o_eyetv_noInstance_lbl" = id; - "o_eyetv_notLaunched_view" = id; - "o_eyetv_previousProgram_btn" = id; - "o_eyetv_running_view" = id; - "o_file_btn_browse" = id; - "o_file_path" = id; - "o_file_stream" = id; - "o_file_sub_align_lbl" = id; - "o_file_sub_align_pop" = id; - "o_file_sub_btn_browse" = id; - "o_file_sub_btn_settings" = id; - "o_file_sub_ckbox" = id; - "o_file_sub_delay" = id; - "o_file_sub_delay_lbl" = id; - "o_file_sub_delay_stp" = id; - "o_file_sub_encoding_lbl" = id; - "o_file_sub_encoding_pop" = id; - "o_file_sub_file_box" = id; - "o_file_sub_font_box" = id; - "o_file_sub_fps" = id; - "o_file_sub_fps_lbl" = id; - "o_file_sub_fps_stp" = id; - "o_file_sub_ok_btn" = id; - "o_file_sub_override" = id; - "o_file_sub_path" = id; - "o_file_sub_sheet" = id; - "o_file_sub_size_lbl" = id; - "o_file_sub_size_pop" = id; - "o_mrl" = id; - "o_mrl_lbl" = id; - "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; - "o_net_udpm_addr" = id; - "o_net_udpm_addr_lbl" = id; - "o_net_udpm_port" = id; - "o_net_udpm_port_lbl" = id; - "o_net_udpm_port_stp" = id; - "o_output_ckbox" = id; - "o_panel" = id; - "o_playlist" = id; - "o_screen_follow_mouse_ckb" = id; - "o_screen_fps_fld" = id; - "o_screen_fps_lbl" = id; - "o_screen_fps_stp" = id; - "o_screen_height_fld" = id; - "o_screen_height_lbl" = id; - "o_screen_height_stp" = id; - "o_screen_lbl" = id; - "o_screen_left_fld" = id; - "o_screen_left_lbl" = id; - "o_screen_left_stp" = id; - "o_screen_long_lbl" = id; - "o_screen_top_fld" = id; - "o_screen_top_lbl" = id; - "o_screen_top_stp" = id; - "o_screen_view" = id; - "o_screen_width_fld" = id; - "o_screen_width_lbl" = id; - "o_screen_width_stp" = id; - "o_sout_options" = id; - "o_tabview" = id; - }; - SUPERCLASS = NSObject; - }, - { - CLASS = VLCOpenTextField; - LANGUAGE = ObjC; - SUPERCLASS = NSTextField; - }, - { - ACTIONS = { - announceChanged = id; - outputChanged = id; - outputCloseSheet = id; - outputFileBrowse = id; - outputInfoChanged = id; - outputMethodChanged = id; - outputSettings = id; - streamPortStepperChanged = id; - streamTTLStepperChanged = id; - transcodeChanged = id; - transcodeInfoChanged = id; - }; - CLASS = VLCOutput; - LANGUAGE = ObjC; - OUTLETS = { - "o_btn_browse" = id; - "o_btn_ok" = id; - "o_channel_name" = id; - "o_channel_name_lbl" = id; - "o_display" = id; - "o_dump_chkbox" = id; - "o_file_chkbox" = id; - "o_file_field" = id; - "o_http_chkbox" = id; - "o_method" = id; - "o_misc_lbl" = id; - "o_mux_lbl" = id; - "o_mux_selector" = id; - "o_open_panel" = id; - "o_options_lbl" = id; - "o_output_ckbox" = id; - "o_output_settings" = id; - "o_output_sheet" = id; - "o_rtsp_chkbox" = id; - "o_sap_chkbox" = id; - "o_sdp_url" = id; - "o_sdp_url_lbl" = id; - "o_stream_address" = id; - "o_stream_address_lbl" = id; - "o_stream_port" = id; - "o_stream_port_lbl" = id; - "o_stream_port_stp" = id; - "o_stream_ttl" = id; - "o_stream_ttl_lbl" = id; - "o_stream_ttl_stp" = id; - "o_stream_type" = id; - "o_stream_type_lbl" = id; - "o_transcode_audio_bitrate" = id; - "o_transcode_audio_bitrate_lbl" = id; - "o_transcode_audio_channels" = id; - "o_transcode_audio_channels_lbl" = id; - "o_transcode_audio_chkbox" = id; - "o_transcode_audio_selector" = id; - "o_transcode_lbl" = id; - "o_transcode_video_bitrate" = id; - "o_transcode_video_bitrate_lbl" = id; - "o_transcode_video_chkbox" = id; - "o_transcode_video_scale" = id; - "o_transcode_video_scale_lbl" = id; - "o_transcode_video_selector" = id; - }; - SUPERCLASS = NSObject; - }, - { - CLASS = VLCPlaylist; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - } - ); - IBVersion = 1; -} \ No newline at end of file + + + + + IBClasses + + + ACTIONS + + eyetvGetPlugin + id + eyetvLaunch + id + eyetvSwitchChannel + id + openCaptureModeChanged + id + openDisc + id + openDiscMenusChanged + id + openDiscStepperChanged + id + openDiscTypeChanged + id + openFile + id + openFileBrowse + id + openFileGeneric + id + openFileStreamChanged + id + openNet + id + openNetModeChanged + id + openNetStepperChanged + id + openVTSBrowse + id + panelCancel + id + panelOk + id + screenStepperChanged + id + subCloseSheet + id + subDelayStepperChanged + id + subFileBrowse + id + subFpsStepperChanged + id + subOverride + id + subSettings + id + subsChanged + id + + CLASS + VLCOpen + LANGUAGE + ObjC + OUTLETS + + o_btn_cancel + id + o_btn_ok + id + o_capture_label_view + id + o_capture_lbl + id + o_capture_long_lbl + id + o_capture_mode_pop + id + o_currentCaptureView + id + o_disc_chapter + id + o_disc_chapter_lbl + id + o_disc_chapter_stp + id + o_disc_device + id + o_disc_device_lbl + id + o_disc_dvd_menus + id + o_disc_title + id + o_disc_title_lbl + id + o_disc_title_stp + id + o_disc_type + id + o_disc_videots_btn_browse + id + o_disc_videots_folder + id + o_eyetv_channels_pop + id + o_eyetv_chn_bgbar + id + o_eyetv_chn_status_txt + id + o_eyetv_currentChannel_lbl + id + o_eyetv_getPlugin_btn + id + o_eyetv_launchEyeTV_btn + id + o_eyetv_nextProgram_btn + id + o_eyetv_noInstanceLong_lbl + id + o_eyetv_noInstance_lbl + id + o_eyetv_notLaunched_view + id + o_eyetv_previousProgram_btn + id + o_eyetv_running_view + id + o_file_btn_browse + id + o_file_path + id + o_file_stream + id + o_file_sub_align_lbl + id + o_file_sub_align_pop + id + o_file_sub_btn_browse + id + o_file_sub_btn_settings + id + o_file_sub_ckbox + id + o_file_sub_delay + id + o_file_sub_delay_lbl + id + o_file_sub_delay_stp + id + o_file_sub_encoding_lbl + id + o_file_sub_encoding_pop + id + o_file_sub_file_box + id + o_file_sub_font_box + id + o_file_sub_fps + id + o_file_sub_fps_lbl + id + o_file_sub_fps_stp + id + o_file_sub_ok_btn + id + o_file_sub_override + id + o_file_sub_path + id + o_file_sub_sheet + id + o_file_sub_size_lbl + id + o_file_sub_size_pop + id + o_mrl + id + o_mrl_lbl + id + 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 + o_net_udpm_addr + id + o_net_udpm_addr_lbl + id + o_net_udpm_port + id + o_net_udpm_port_lbl + id + o_net_udpm_port_stp + id + o_output_ckbox + id + o_panel + id + o_playlist + id + o_screen_follow_mouse_ckb + id + o_screen_fps_fld + id + o_screen_fps_lbl + id + o_screen_fps_stp + id + o_screen_height_fld + id + o_screen_height_lbl + id + o_screen_height_stp + id + o_screen_lbl + id + o_screen_left_fld + id + o_screen_left_lbl + id + o_screen_left_stp + id + o_screen_long_lbl + id + o_screen_top_fld + id + o_screen_top_lbl + id + o_screen_top_stp + id + o_screen_view + id + o_screen_width_fld + id + o_screen_width_lbl + id + o_screen_width_stp + id + o_sout_options + id + o_tabview + id + + SUPERCLASS + NSObject + + + CLASS + VLCPlaylistCommon + LANGUAGE + ObjC + OUTLETS + + o_outline_view + id + o_tc_author + id + o_tc_duration + id + o_tc_name + id + + SUPERCLASS + NSObject + + + CLASS + VLCOpenTextField + LANGUAGE + ObjC + SUPERCLASS + NSTextField + + + ACTIONS + + announceChanged + id + outputChanged + id + outputCloseSheet + id + outputFileBrowse + id + outputInfoChanged + id + outputMethodChanged + id + outputSettings + id + streamPortStepperChanged + id + streamTTLStepperChanged + id + transcodeChanged + id + transcodeInfoChanged + id + + CLASS + VLCOutput + LANGUAGE + ObjC + OUTLETS + + o_btn_browse + id + o_btn_ok + id + o_channel_name + id + o_channel_name_lbl + id + o_display + id + o_dump_chkbox + id + o_file_chkbox + id + o_file_field + id + o_http_chkbox + id + o_method + id + o_misc_lbl + id + o_mux_lbl + id + o_mux_selector + id + o_open_panel + id + o_options_lbl + id + o_output_ckbox + id + o_output_settings + id + o_output_sheet + id + o_rtsp_chkbox + id + o_sap_chkbox + id + o_sdp_url + id + o_sdp_url_lbl + id + o_stream_address + id + o_stream_address_lbl + id + o_stream_port + id + o_stream_port_lbl + id + o_stream_port_stp + id + o_stream_ttl + id + o_stream_ttl_lbl + id + o_stream_ttl_stp + id + o_stream_type + id + o_stream_type_lbl + id + o_transcode_audio_bitrate + id + o_transcode_audio_bitrate_lbl + id + o_transcode_audio_channels + id + o_transcode_audio_channels_lbl + id + o_transcode_audio_chkbox + id + o_transcode_audio_selector + id + o_transcode_lbl + id + o_transcode_video_bitrate + id + o_transcode_video_bitrate_lbl + id + o_transcode_video_chkbox + id + o_transcode_video_scale + id + o_transcode_video_scale_lbl + id + o_transcode_video_selector + id + + SUPERCLASS + NSObject + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + ACTIONS + + addNode + id + deleteItem + id + downloadCoverArt + id + playItem + id + preparseItem + id + recursiveExpandNode + id + revealItemInFinder + id + savePlaylist + id + searchItem + id + selectAll + id + servicesChange + id + sortNodeByAuthor + id + sortNodeByName + id + + CLASS + VLCPlaylist + LANGUAGE + ObjC + OUTLETS + + o_btn_addNode + id + o_btn_playlist + id + o_controller + id + o_ctx_menu + id + o_mi_addNode + id + o_mi_delete + id + o_mi_dl_cover_art + id + o_mi_info + id + o_mi_play + id + o_mi_preparse + id + o_mi_recursive_expand + id + o_mi_revealInFinder + id + o_mi_save_playlist + id + o_mi_selectall + id + o_mi_services + id + o_mi_sort_author + id + o_mi_sort_name + id + o_mm_mi_revealInFinder + id + o_mm_mi_services + id + o_mm_mu_services + id + o_mu_services + id + o_playlist_view + id + o_playlist_wizard + id + o_save_accessory_popup + id + o_save_accessory_text + id + o_save_accessory_view + id + o_search_field + id + o_status_field + id + o_tc_sortColumn + id + + SUPERCLASS + VLCPlaylistCommon + + + IBVersion + 1 + + diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib index 93d70e48dc..10243f66a0 100644 --- a/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib +++ b/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib @@ -2,27 +2,14 @@ - IBDocumentLocation - 171 127 356 240 0 0 1280 778 - IBEditorPositions - - 2297 - 366 400 548 264 0 0 1280 778 - 2301 - 366 417 548 264 0 0 1280 778 - 2304 - 366 380 547 264 0 0 1280 778 - 2346 - 366 400 548 264 0 0 1280 778 - IBFramework Version - 489.0 + 677 IBOldestOS 5 IBOpenObjects - 636 2346 + 683 2297 IBSystem Version diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib index fd53abd294..52f5206a78 100644 Binary files a/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib differ diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h index c223870df5..d925751848 100644 --- a/modules/gui/macosx/open.h +++ b/modules/gui/macosx/open.h @@ -76,7 +76,6 @@ 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; /* open subtitle file */ IBOutlet id o_file_sub_ckbox; diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index 3402af6547..617e3775cd 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -193,7 +193,6 @@ 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" )]; @@ -401,11 +400,6 @@ 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"]]; - } if( [[[o_tabview selectedTabViewItem] label] isEqualToString: _NS("Capture")] ) { if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] )