Commit 740e1aad authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: expose continue playback option in simple settings

parent fa4d67b2
...@@ -104,10 +104,13 @@ Visualizations: ...@@ -104,10 +104,13 @@ Visualizations:
Interfaces: Interfaces:
* Add support for subtitles drag 'n drop in skins2 * Add support for subtitles drag 'n drop in skins2
* Add record button in Qt menus * Add record button in Qt menus
* Fixes for advanced preferences on OS X
* New module for core dialogs on iOS * New module for core dialogs on iOS
* New layout for Qt buttons customization * New layout for Qt buttons customization
Mac OS X Interface:
* Support to continue media playback where it was left off
* Fixes for advanced preferences
Misc: Misc:
* New module for TLS on OS X and iOS * New module for TLS on OS X and iOS
* Windows installer will kill running instance before installing * Windows installer will kill running instance before installing
......
/***************************************************************************** /*****************************************************************************
* macosx.m: Mac OS X module for vlc * macosx.m: Mac OS X module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2013 VLC authors and VideoLAN * Copyright (C) 2001-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>
......
...@@ -109,6 +109,8 @@ ...@@ -109,6 +109,8 @@
IBOutlet id o_intf_luahttppwd_fld; IBOutlet id o_intf_luahttppwd_fld;
IBOutlet id o_intf_pauseitunes_lbl; IBOutlet id o_intf_pauseitunes_lbl;
IBOutlet id o_intf_pauseitunes_pop; IBOutlet id o_intf_pauseitunes_pop;
IBOutlet id o_intf_continueplayback_lbl;
IBOutlet id o_intf_continueplayback_pop;
IBOutlet id o_osd_encoding_pop; IBOutlet id o_osd_encoding_pop;
IBOutlet id o_osd_encoding_txt; IBOutlet id o_osd_encoding_txt;
......
...@@ -372,6 +372,7 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc ...@@ -372,6 +372,7 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
[o_intf_luahttp_box setTitle:_NS("Lua HTTP")]; [o_intf_luahttp_box setTitle:_NS("Lua HTTP")];
[o_intf_luahttppwd_lbl setStringValue:_NS("Password")]; [o_intf_luahttppwd_lbl setStringValue:_NS("Password")];
[o_intf_pauseitunes_lbl setStringValue:_NS("Control external music players")]; [o_intf_pauseitunes_lbl setStringValue:_NS("Control external music players")];
[o_intf_continueplayback_lbl setStringValue:_NS("Continue playback")];
/* Subtitles and OSD */ /* Subtitles and OSD */
[o_osd_encoding_txt setStringValue: _NS("Default Encoding")]; [o_osd_encoding_txt setStringValue: _NS("Default Encoding")];
...@@ -597,6 +598,7 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam ...@@ -597,6 +598,7 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
[self setupButton: o_intf_pauseminimized_ckb forBoolValue: "macosx-pause-minimized"]; [self setupButton: o_intf_pauseminimized_ckb forBoolValue: "macosx-pause-minimized"];
[self setupField: o_intf_luahttppwd_fld forOption: "http-password"]; [self setupField: o_intf_luahttppwd_fld forOption: "http-password"];
[self setupButton: o_intf_pauseitunes_pop forIntList: "macosx-control-itunes"]; [self setupButton: o_intf_pauseitunes_pop forIntList: "macosx-control-itunes"];
[self setupButton: o_intf_continueplayback_pop forIntList: "macosx-continue-playback"];
/****************** /******************
* audio settings * * audio settings *
...@@ -943,6 +945,7 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -943,6 +945,7 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
config_PutPsz(p_intf, "http-password", [[o_intf_luahttppwd_fld stringValue] UTF8String]); config_PutPsz(p_intf, "http-password", [[o_intf_luahttppwd_fld stringValue] UTF8String]);
SaveIntList(o_intf_pauseitunes_pop, "macosx-control-itunes"); SaveIntList(o_intf_pauseitunes_pop, "macosx-control-itunes");
SaveIntList(o_intf_continueplayback_pop, "macosx-continue-playback");
/* activate stuff without restart */ /* activate stuff without restart */
if ([o_intf_appleremote_ckb state] == YES) if ([o_intf_appleremote_ckb state] == YES)
......
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