Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
740e1aad
Commit
740e1aad
authored
Apr 26, 2014
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: expose continue playback option in simple settings
parent
fa4d67b2
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
195 additions
and
43 deletions
+195
-43
NEWS
NEWS
+4
-1
extras/package/macosx/Resources/English.lproj/Preferences.xib
...as/package/macosx/Resources/English.lproj/Preferences.xib
+185
-41
modules/gui/macosx/macosx.m
modules/gui/macosx/macosx.m
+1
-1
modules/gui/macosx/simple_prefs.h
modules/gui/macosx/simple_prefs.h
+2
-0
modules/gui/macosx/simple_prefs.m
modules/gui/macosx/simple_prefs.m
+3
-0
No files found.
NEWS
View file @
740e1aad
...
@@ -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
...
...
extras/package/macosx/Resources/English.lproj/Preferences.xib
View file @
740e1aad
This diff is collapsed.
Click to expand it.
modules/gui/macosx/macosx.m
View file @
740e1aad
/*****************************************************************************
/*****************************************************************************
* macosx.m: Mac OS X module for vlc
* macosx.m: Mac OS X module for vlc
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001-201
3
VLC authors and VideoLAN
* Copyright (C) 2001-201
4
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
>
...
...
modules/gui/macosx/simple_prefs.h
View file @
740e1aad
...
@@ -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
;
...
...
modules/gui/macosx/simple_prefs.m
View file @
740e1aad
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment