Commit 0e423c09 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: remove 'vout' option from simple prefs since it is clearly an advanced...

macosx: remove 'vout' option from simple prefs since it is clearly an advanced option this OS, which can break the setup way too easily
parent 75cc1f0e
/***************************************************************************** /*****************************************************************************
* simple_prefs.h: Simple Preferences for Mac OS X * simple_prefs.h: Simple Preferences for Mac OS X
***************************************************************************** *****************************************************************************
* Copyright (C) 2008-2013 VLC authors and VideoLAN * Copyright (C) 2008-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne at videolan dot org> * Authors: Felix Paul Kühne <fkuehne at videolan dot org>
...@@ -150,8 +150,6 @@ ...@@ -150,8 +150,6 @@
IBOutlet id o_video_fullscreen_ckb; IBOutlet id o_video_fullscreen_ckb;
IBOutlet id o_video_videodeco_ckb; IBOutlet id o_video_videodeco_ckb;
IBOutlet id o_video_onTop_ckb; IBOutlet id o_video_onTop_ckb;
IBOutlet id o_video_output_pop;
IBOutlet id o_video_output_txt;
IBOutlet id o_video_skipFrames_ckb; IBOutlet id o_video_skipFrames_ckb;
IBOutlet id o_video_snap_box; IBOutlet id o_video_snap_box;
IBOutlet id o_video_snap_folder_btn; IBOutlet id o_video_snap_folder_btn;
......
/***************************************************************************** /*****************************************************************************
* simple_prefs.m: Simple Preferences for Mac OS X * simple_prefs.m: Simple Preferences for Mac OS X
***************************************************************************** *****************************************************************************
* Copyright (C) 2008-2013 VLC authors and VideoLAN * Copyright (C) 2008-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne at videolan dot org> * Authors: Felix Paul Kühne <fkuehne at videolan dot org>
...@@ -397,7 +397,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc ...@@ -397,7 +397,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
[o_video_fullscreen_ckb setTitle: _NS("Fullscreen")]; [o_video_fullscreen_ckb setTitle: _NS("Fullscreen")];
[o_video_videodeco_ckb setTitle: _NS("Window decorations")]; [o_video_videodeco_ckb setTitle: _NS("Window decorations")];
[o_video_onTop_ckb setTitle: _NS("Float on Top")]; [o_video_onTop_ckb setTitle: _NS("Float on Top")];
[o_video_output_txt setStringValue: _NS("Output module")];
[o_video_skipFrames_ckb setTitle: _NS("Skip frames")]; [o_video_skipFrames_ckb setTitle: _NS("Skip frames")];
[o_video_snap_box setTitle: _NS("Video snapshots")]; [o_video_snap_box setTitle: _NS("Video snapshots")];
[o_video_snap_folder_btn setTitle: _NS("Browse...")]; [o_video_snap_folder_btn setTitle: _NS("Browse...")];
...@@ -658,8 +657,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam ...@@ -658,8 +657,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
[self setupButton: o_video_black_ckb forBoolValue: "macosx-black"]; [self setupButton: o_video_black_ckb forBoolValue: "macosx-black"];
[self setupButton: o_video_videodeco_ckb forBoolValue: "video-deco"]; [self setupButton: o_video_videodeco_ckb forBoolValue: "video-deco"];
[self setupButton: o_video_output_pop forModuleList: "vout"];
[o_video_device_pop removeAllItems]; [o_video_device_pop removeAllItems];
i = 0; i = 0;
y = [[NSScreen screens] count]; y = [[NSScreen screens] count];
...@@ -999,7 +996,6 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -999,7 +996,6 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
config_PutInt(p_intf, "skip-frames", [o_video_skipFrames_ckb state]); config_PutInt(p_intf, "skip-frames", [o_video_skipFrames_ckb state]);
config_PutInt(p_intf, "macosx-black", [o_video_black_ckb state]); config_PutInt(p_intf, "macosx-black", [o_video_black_ckb state]);
SaveModuleList(o_video_output_pop, "vout");
config_PutInt(p_intf, "macosx-vdev", [[o_video_device_pop selectedItem] tag]); config_PutInt(p_intf, "macosx-vdev", [[o_video_device_pop selectedItem] tag]);
config_PutPsz(p_intf, "snapshot-path", [[o_video_snap_folder_fld stringValue] UTF8String]); config_PutPsz(p_intf, "snapshot-path", [[o_video_snap_folder_fld stringValue] UTF8String]);
......
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