[vlc-commits] h264_nal: fix memory corruption in parse_sps
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sat Dec 5
16:16:19 2015 +0100| [d405bfb6fdeac41112482bcce793ee4efa8d5d51] | committer:
David Fuhrmann
h264_nal: fix memory corruption in parse_sps
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d405bfb6fdeac41112482bcce793ee4efa8d5d51
---
modules/packetizer/h264_nal.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/packetizer/h264_nal.c b/modules/packetizer/h264_nal.c
index fee3f96..d5b04ae 100644
--- a/modules/packetizer/h264_nal.c
+++ b/modules/packetizer/h264_nal.c
@@ -417,7 +417,7 @@ int h264_parse_sps( const uint8_t *p_sps_buf, int
i_sps_size,
struct nal_sps *p_sps )
{
uint8_t *pb_dec = NULL;
-int i_dec = 0;
+size_t i_dec = 0;
bs_t s;
int i_tmp;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: overhaul simple preferences interface
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sat Dec 5 15:12:44 2015 +0100| [7e08a135c91a73a1f410cdbc1492465ae1b07114] | committer: David Fuhrmann macosx: overhaul simple preferences interface - cleanup interfaces section - Regroup settings, move some to video section - remove rarely used settings from the simple settings page - reorder outlets and setup code close #14504 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7e08a135c91a73a1f410cdbc1492465ae1b07114 --- .../Resources/English.lproj/SimplePreferences.xib | 863 ++-- modules/gui/macosx/simple_prefs.h | 76 +- modules/gui/macosx/simple_prefs.m | 113 ++- 3 files changed, 540 insertions(+), 512 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=7e08a135c91a73a1f410cdbc1492465ae1b07114 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Allow to open https URLs, do not list VLC as a browser
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sat Dec 5 17:12:22 2015 +0100| [66bab23eb7950a19279bad31dc642f8c87e90447] | committer: David Fuhrmann macosx: Allow to open https URLs, do not list VLC as a browser This allows to drop https URLs on the VLC icon as well, in addition to http URLs. Additionally, this removes VLC again from the list of web browsers the user can choose in system settings --> general. close #13672 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=66bab23eb7950a19279bad31dc642f8c87e90447 --- extras/package/macosx/Info.plist.in |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extras/package/macosx/Info.plist.in b/extras/package/macosx/Info.plist.in index 2f80fbc..3b3977a 100644 --- a/extras/package/macosx/Info.plist.in +++ b/extras/package/macosx/Info.plist.in @@ -1376,10 +1376,13 @@ CFBundleURLIconFile generic CFBundleURLName - http url + http(s) url + LSHandlerRank + None CFBundleURLSchemes http + https ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Revert "macosx: update play and playback mode status on startup"
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sat Dec 5 16:39:55 2015 +0100| [e2f1f6c44c514cea28dd1c4c5e9cc608792099ee] | committer: David Fuhrmann Revert "macosx: update play and playback mode status on startup" This hack is not needed anymore. refs #14362 This reverts commit 5598f816905d5262928650c38d6b9a501b232deb. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e2f1f6c44c514cea28dd1c4c5e9cc608792099ee --- modules/gui/macosx/intf.m |7 --- 1 file changed, 7 deletions(-) diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 61a609c..63d3e43 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -308,13 +308,6 @@ static VLCMain *sharedInstance = nil; [[self mainWindow] updateTimeSlider]; [[self mainWindow] updateVolumeSlider]; -/* Hack: Playlist is started before the interface. - * Thus, call additional updaters as we might miss these events if posted before - * the callbacks are registered. - */ -[_input_manager inputThreadChanged]; -[_playlist playbackModeUpdated]; - // respect playlist-autostart // note that PLAYLIST_PLAY will not stop any playback if already started playlist_t * p_playlist = pl_Get(VLCIntf); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: improve logging for startup and shutdown
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sat Dec 5
16:38:38 2015 +0100| [f312e26702a01c9b5476dee5c6a06f94decac8c8] | committer:
David Fuhrmann
macosx: improve logging for startup and shutdown
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f312e26702a01c9b5476dee5c6a06f94decac8c8
---
modules/gui/macosx/InputManager.m |2 ++
modules/gui/macosx/PLModel.m |2 ++
modules/gui/macosx/intf.m |1 +
3 files changed, 5 insertions(+)
diff --git a/modules/gui/macosx/InputManager.m
b/modules/gui/macosx/InputManager.m
index d39c6a8..3703d1a 100644
--- a/modules/gui/macosx/InputManager.m
+++ b/modules/gui/macosx/InputManager.m
@@ -155,6 +155,8 @@ static int InputEvent(vlc_object_t *p_this, const char
*psz_var,
{
self = [super init];
if(self) {
+msg_Dbg(VLCIntf, "Initializing input manager");
+
o_main = o_mainObj;
var_AddCallback(pl_Get(VLCIntf), "input-current", InputThreadChanged,
(__bridge void *)self);
diff --git a/modules/gui/macosx/PLModel.m b/modules/gui/macosx/PLModel.m
index ea5840b..57ea245 100644
--- a/modules/gui/macosx/PLModel.m
+++ b/modules/gui/macosx/PLModel.m
@@ -126,6 +126,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char
*psz_var,
_outlineView = outlineView;
_playlist = plObj;
+msg_Dbg(VLCIntf, "Initializing playlist model");
var_AddCallback(p_playlist, "item-change", PLItemUpdated, (__bridge
void *)self);
var_AddCallback(p_playlist, "playlist-item-append", PLItemAppended,
(__bridge void *)self);
var_AddCallback(p_playlist, "playlist-item-deleted", PLItemRemoved,
(__bridge void *)self);
@@ -146,6 +147,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char
*psz_var,
- (void)dealloc
{
+msg_Dbg(VLCIntf, "Deinitializing playlist model");
var_DelCallback(p_playlist, "item-change", PLItemUpdated, (__bridge void
*)self);
var_DelCallback(p_playlist, "playlist-item-append", PLItemAppended,
(__bridge void *)self);
var_DelCallback(p_playlist, "playlist-item-deleted", PLItemRemoved,
(__bridge void *)self);
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 96fb2e7..61a609c 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -96,6 +96,7 @@ int OpenIntf (vlc_object_t *p_this)
[NSBundle loadNibNamed:@"MainMenu" owner:[[VLCMain sharedInstance]
mainMenu]];
[[[VLCMain sharedInstance] mainWindow] makeKeyAndOrderFront:nil];
+msg_Dbg(p_intf, "Finished loading macosx interface");
return VLC_SUCCESS;
}
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: CAS: Fix some l10n of stream panel
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Mon Nov 30
19:37:56 2015 +0100| [1ef87d326e95b6640e9079dd4cd04dca721e2663] | committer:
David Fuhrmann
macosx: CAS: Fix some l10n of stream panel
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1ef87d326e95b6640e9079dd4cd04dca721e2663
---
modules/gui/macosx/ConvertAndSave.m |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/gui/macosx/ConvertAndSave.m
b/modules/gui/macosx/ConvertAndSave.m
index 053644a..5dce4ee 100644
--- a/modules/gui/macosx/ConvertAndSave.m
+++ b/modules/gui/macosx/ConvertAndSave.m
@@ -142,7 +142,7 @@
[_fileDestinationFileName setHidden: YES];
[_fileDestinationBrowseButton setTitle:_NS("Browse...")];
[_streamDestinationButton setTitle:_NS("Setup Streaming...")];
-[_streamDestinationURLLabel setStringValue:@"Select Streaming Method"];
+[_streamDestinationURLLabel setStringValue:_NS(@"Select Streaming
Method")];
[_destinationFileButton setTitle:_NS("Save as File")];
[_destinationStreamButton setTitle:_NS("Stream")];
[_destinationCancelBtn setHidden:YES];
@@ -192,6 +192,7 @@
[[_streamSDPMatrix cellWithTag:3] setTitle:_NS("Export SDP as file")];
[_streamSAPCheckbox setState:NSOffState];
[_streamSDPMatrix setEnabled:NO];
+[_streamSDPFileBrowseButton setStringValue:_NS("Browse...")];
/* there is no way to hide single cells, so replace the existing ones with
empty cells.. */
id blankCell = [[NSCell alloc] init];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: CAS: Fix some l10n of stream panel
vlc/vlc-2.2 | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Mon
Nov 30 19:53:30 2015 +0100| [164c0d3783dc2153d2669f822d604bcf30271365] |
committer: David Fuhrmann
macosx: CAS: Fix some l10n of stream panel
manually backported from 1ef87d326e95b6640e9079dd4cd04dca721e2663.
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=164c0d3783dc2153d2669f822d604bcf30271365
---
modules/gui/macosx/ConvertAndSave.m |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/gui/macosx/ConvertAndSave.m
b/modules/gui/macosx/ConvertAndSave.m
index 631af73..5ad5238 100644
--- a/modules/gui/macosx/ConvertAndSave.m
+++ b/modules/gui/macosx/ConvertAndSave.m
@@ -160,7 +160,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[_destination_filename_lbl setHidden: YES];
[_destination_browse_btn setTitle:_NS("Browse...")];
[_destination_stream_btn setTitle:_NS("Setup Streaming...")];
-[_destination_stream_lbl setStringValue:@"Select Streaming Method"];
+[_destination_stream_lbl setStringValue:_NS("Select Streaming Method")];
[_destination_itwantafile_btn setTitle:_NS("Save as File")];
[_destination_itwantastream_btn setTitle:_NS("Stream")];
[_destination_cancel_btn setHidden:YES];
@@ -207,6 +207,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[[_stream_sdp_matrix cellWithTag:3] setTitle:_NS("Export SDP as file")];
[_stream_sap_ckb setState:NSOffState];
[_stream_sdp_matrix setEnabled:NO];
+[_stream_sdp_browsefile_btn setStringValue:_NS("Browse...")];
/* there is no way to hide single cells, so replace the existing ones with
empty cells.. */
id blankCell = [[[NSCell alloc] init] autorelease];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix typo
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Mon Nov 30
19:45:48 2015 +0100| [7d502e3b28459706436d2f8b2c4702c0055680c8] | committer:
David Fuhrmann
macosx: fix typo
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7d502e3b28459706436d2f8b2c4702c0055680c8
---
modules/gui/macosx/ConvertAndSave.m |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/gui/macosx/ConvertAndSave.m
b/modules/gui/macosx/ConvertAndSave.m
index 5dce4ee..6cfb7bd 100644
--- a/modules/gui/macosx/ConvertAndSave.m
+++ b/modules/gui/macosx/ConvertAndSave.m
@@ -142,7 +142,7 @@
[_fileDestinationFileName setHidden: YES];
[_fileDestinationBrowseButton setTitle:_NS("Browse...")];
[_streamDestinationButton setTitle:_NS("Setup Streaming...")];
-[_streamDestinationURLLabel setStringValue:_NS(@"Select Streaming
Method")];
+[_streamDestinationURLLabel setStringValue:_NS("Select Streaming Method")];
[_destinationFileButton setTitle:_NS("Save as File")];
[_destinationStreamButton setTitle:_NS("Stream")];
[_destinationCancelBtn setHidden:YES];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: CAS: Fix 2 more label l10n with missing outlets
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Mon Nov 30 20:05:15 2015 +0100| [bfcbe0a5eb6ff7ee305e9cfc25a19cfb508e15a6] | committer: David Fuhrmann macosx: CAS: Fix 2 more label l10n with missing outlets > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bfcbe0a5eb6ff7ee305e9cfc25a19cfb508e15a6 --- .../Resources/English.lproj/ConvertAndSave.xib | 8664 +++- modules/gui/macosx/ConvertAndSave.h|2 + modules/gui/macosx/ConvertAndSave.m|2 + 3 files changed, 1367 insertions(+), 7301 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=bfcbe0a5eb6ff7ee305e9cfc25a19cfb508e15a6 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: CAS: Fix 2 more label l10n with missing outlets
vlc/vlc-2.2 | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Mon Nov 30 20:15:50 2015 +0100| [b75cb597797c0334f65115c2666e8ae095c434de] | committer: David Fuhrmann macosx: CAS: Fix 2 more label l10n with missing outlets Manual backport of bfcbe0a5eb6ff7ee305e9cfc25a19cfb508e15a6. > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=b75cb597797c0334f65115c2666e8ae095c434de --- .../Resources/English.lproj/ConvertAndSave.xib | 229 +++- modules/gui/macosx/ConvertAndSave.h|2 + modules/gui/macosx/ConvertAndSave.m|2 + 3 files changed, 77 insertions(+), 156 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=b75cb597797c0334f65115c2666e8ae095c434de ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] NEWS: Mention El Capitan support
vlc/vlc-2.2 | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sun Nov 22 16:27:56 2015 +0100| [096c37f083dd99d5d76aa4eaeb53e34badd39368] | committer: David Fuhrmann NEWS: Mention El Capitan support > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=096c37f083dd99d5d76aa4eaeb53e34badd39368 --- NEWS |4 1 file changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 8f91959..d84c388 100644 --- a/NEWS +++ b/NEWS @@ -27,6 +27,10 @@ Skins2: * Fix UTF-8 conversion issues * Fix Unicode folders location failing to open the skins +OS X: + * Support for OS X El Capitan + * Fix code signature for releases on El Capitan + Misc: * Fix build if one disables XCB but activate VDPAU on Unix * Fix build with recent FreeRDP versions ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] lua readme: mention state as second parameter for add_check_box
vlc/vlc-2.2 | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Thu Jun 11 19:25:39 2015 +0200| [601c5502d2db7a6162f5c805412e0ded3c1311b6] | committer: Jean-Baptiste Kempf lua readme: mention state as second parameter for add_check_box (cherry picked from commit 377bab66f9721a22a9c1bb82acd84cd71db45b14) Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=601c5502d2db7a6162f5c805412e0ded3c1311b6 --- share/lua/README.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/lua/README.txt b/share/lua/README.txt index 84f322f..a3fea24 100644 --- a/share/lua/README.txt +++ b/share/lua/README.txt @@ -71,7 +71,7 @@ d:add_label( text, ... ): Create a text label with caption "text" (string). d:add_html( text, ... ): Create a rich text label with caption "text" (string), that supports basic HTML formatting (such as or for instance). d:add_text_input( text, ... ): Create an editable text field, in order to read user input. d:add_password( text, ... ): Create an editable text field, in order to read user input. Text entered in this box will not be readable (replaced by asterisks). -d:add_check_box( text, ... ): Create a check box with a text. They have a boolean state (true/false). +d:add_check_box( text, state, ... ): Create a check box with a text. They have a boolean state (true/false). d:add_dropdown( ... ): Create a drop-down widget. Only 1 element can be selected the same time. d:add_list( ... ): Create a list widget. Allows multiple or empty selections. d:add_image( path, ... ): Create an image label. path is a relative or absolute path to the image on the local computer. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix error message for media information panel
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Wed Oct 21
22:35:05 2015 +0200| [10145e039042c1a15e92b47d7e88f1d632d9c6a1] | committer:
David Fuhrmann
macosx: fix error message for media information panel
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=10145e039042c1a15e92b47d7e88f1d632d9c6a1
---
modules/gui/macosx/VLCPlaylistInfo.m |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/gui/macosx/VLCPlaylistInfo.m
b/modules/gui/macosx/VLCPlaylistInfo.m
index d0755e7..1c971f2 100644
--- a/modules/gui/macosx/VLCPlaylistInfo.m
+++ b/modules/gui/macosx/VLCPlaylistInfo.m
@@ -359,9 +359,9 @@
return;
error:
-NSRunAlertPanel(_NS("Error while saving meta"),
-@"%@",_NS("VLC was unable to save the meta data."),
-_NS("OK"), nil, nil);
+NSRunAlertPanel(_NS("Error while saving meta"), @"%@",
+_NS("OK"), nil, nil,
+_NS("VLC was unable to save the meta data."));
}
- (IBAction)downloadCoverArt:(id)sender
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Introduce OSX_EL_CAPITAN runtime check
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sat Oct 10
16:54:34 2015 +0200| [50dcfe2ac56e9f4e8c98f1cd64076047a20ea83e] | committer:
David Fuhrmann
macosx: Introduce OSX_EL_CAPITAN runtime check
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=50dcfe2ac56e9f4e8c98f1cd64076047a20ea83e
---
modules/gui/macosx/CompatibilityFixes.h |3 ++-
modules/gui/macosx/InputManager.m |2 +-
modules/gui/macosx/MainWindowTitle.m| 10 +-
modules/gui/macosx/StringUtility.m |2 +-
modules/gui/macosx/about.m |2 +-
modules/gui/macosx/misc.m |2 +-
6 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/modules/gui/macosx/CompatibilityFixes.h
b/modules/gui/macosx/CompatibilityFixes.h
index b113990..a3e5a56 100644
--- a/modules/gui/macosx/CompatibilityFixes.h
+++ b/modules/gui/macosx/CompatibilityFixes.h
@@ -28,4 +28,5 @@
#define OSX_LION (NSAppKitVersionNumber < 1162 && NSAppKitVersionNumber >=
1115.2)
#define OSX_MOUNTAIN_LION (NSAppKitVersionNumber < 1244 &&
NSAppKitVersionNumber >= 1162)
#define OSX_MAVERICKS (NSAppKitVersionNumber < 1334 && NSAppKitVersionNumber
>= 1244)
-#define OSX_YOSEMITE (NSAppKitVersionNumber >= 1334)
+#define OSX_YOSEMITE (NSAppKitVersionNumber < 1404 && NSAppKitVersionNumber >=
1334)
+#define OSX_EL_CAPITAN (NSAppKitVersionNumber >= 1404)
diff --git a/modules/gui/macosx/InputManager.m
b/modules/gui/macosx/InputManager.m
index b881221..368f127 100644
--- a/modules/gui/macosx/InputManager.m
+++ b/modules/gui/macosx/InputManager.m
@@ -304,7 +304,7 @@ static int InputEvent(vlc_object_t *p_this, const char
*psz_var,
IOReturn success;
/* work-around a bug in 10.7.4 and 10.7.5, so check for 10.7.x <
10.7.4 and 10.8 */
-if ((NSAppKitVersionNumber >= 1115.2 && NSAppKitVersionNumber <
1138.45) || OSX_MOUNTAIN_LION || OSX_MAVERICKS || OSX_YOSEMITE) {
+if ((NSAppKitVersionNumber >= 1115.2 && NSAppKitVersionNumber <
1138.45) || OSX_MOUNTAIN_LION || OSX_MAVERICKS || OSX_YOSEMITE ||
OSX_EL_CAPITAN) {
CFStringRef reasonForActivity =
CFStringCreateWithCString(kCFAllocatorDefault, _("VLC media playback"),
kCFStringEncodingUTF8);
if ([o_main activeVideoPlayback])
success =
IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep,
kIOPMAssertionLevelOn, reasonForActivity, );
diff --git a/modules/gui/macosx/MainWindowTitle.m
b/modules/gui/macosx/MainWindowTitle.m
index 472a279..5e7921e 100644
--- a/modules/gui/macosx/MainWindowTitle.m
+++ b/modules/gui/macosx/MainWindowTitle.m
@@ -84,7 +84,7 @@
{
b_nativeFullscreenMode = var_InheritBool(VLCIntf,
"macosx-nativefullscreenmode");
-if (!b_nativeFullscreenMode || OSX_YOSEMITE) {
+if (!b_nativeFullscreenMode || OSX_YOSEMITE || OSX_EL_CAPITAN) {
[o_fullscreen_btn setHidden: YES];
}
@@ -118,7 +118,7 @@
- (NSImage *)getButtonImage:(NSString *)o_id
{
NSString *o_name = @"";
-if (OSX_YOSEMITE) {
+if (OSX_YOSEMITE || OSX_EL_CAPITAN) {
o_name = @"yosemite-";
} else { // OSX_LION, OSX_MOUNTAIN_LION, OSX_MAVERICKS
o_name = @"lion-";
@@ -146,7 +146,7 @@
o_green_on_img = [self getButtonImage:@"window-zoom-on"];
// these files are only available in the yosemite variant
-if (OSX_YOSEMITE) {
+if (OSX_YOSEMITE || OSX_EL_CAPITAN) {
o_fullscreen_img = [self getButtonImage:@"window-fullscreen"];
o_fullscreen_over_img = [self
getButtonImage:@"window-fullscreen-over"];
o_fullscreen_on_img = [self getButtonImage:@"window-fullscreen-on"];
@@ -181,7 +181,7 @@
{
// default image for old version, or if native fullscreen is
// disabled on yosemite, or if alt key is pressed
-if (!OSX_YOSEMITE || !b_nativeFullscreenMode || b_alt_pressed) {
+if (!(OSX_YOSEMITE || OSX_EL_CAPITAN) || !b_nativeFullscreenMode ||
b_alt_pressed) {
if (b_mouse_over) {
[o_green_btn setImage: o_green_over_img];
@@ -214,7 +214,7 @@
else if (sender == o_yellow_btn)
[[self window] miniaturize: sender];
else if (sender == o_green_btn) {
-if (OSX_YOSEMITE && b_nativeFullscreenMode && !b_alt_pressed) {
+if ((OSX_YOSEMITE || OSX_EL_CAPITAN) && b_nativeFullscreenMode &&
!b_alt_pressed) {
[[self window] toggleFullScreen:self];
} else {
[[self window] performZoom: sender];
diff --git a/modules/gui/macosx/StringUtility.m
b/modules/gui/macosx/StringUtility.m
index 112b1ab..f920315 100644
--- a/modules/gui/macosx/StringUtility.m
+++ b/modules/gui/macosx/StringUtility.m
@@ -532,7 +532,7 @@ NSString *toNSStr(const char *str) {
NSImage *imageFromRes(NSString *o_id)
{
NSSt
[vlc-commits] macosx: disable native fullscreen on El Capitan
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sat Oct 10
16:58:01 2015 +0200| [e4ea3a00f704337a6a126362433a19c6f22e833f] | committer:
David Fuhrmann
macosx: disable native fullscreen on El Capitan
Native fullscreen seems to be on by default on El Capitan, even
if the corresponding flag is not set.
This implicitely disables the new split view feature if native
fullscreen is disabled.
close #15491
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e4ea3a00f704337a6a126362433a19c6f22e833f
---
modules/gui/macosx/Windows.m |3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m
index 657bab7..d317acb 100644
--- a/modules/gui/macosx/Windows.m
+++ b/modules/gui/macosx/Windows.m
@@ -334,6 +334,9 @@
if (b_nativeFullscreenMode) {
[self setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenPrimary];
+} else if (OSX_EL_CAPITAN) {
+// Native fullscreen seems to be default on El Capitan, this disables
it explicitely
+[self setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
}
[super awakeFromNib];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: disable fullscreen hack on yosemite and higher
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sat Oct 10
16:46:36 2015 +0200| [ffa25effb598b6d58dac62903fb08fc9b8965296] | committer:
David Fuhrmann
macosx: disable fullscreen hack on yosemite and higher
It seems that Apple fixed this issue starting with Yosemite.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ffa25effb598b6d58dac62903fb08fc9b8965296
---
modules/gui/macosx/Windows.m |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m
index c953bbe..657bab7 100644
--- a/modules/gui/macosx/Windows.m
+++ b/modules/gui/macosx/Windows.m
@@ -258,7 +258,7 @@
BOOL b_inFullscreen = [self fullscreen] || ([self
respondsToSelector:@selector(inFullscreenTransition)] && [(VLCVideoWindowCommon
*)self inFullscreenTransition]);
-if((OSX_MAVERICKS || OSX_YOSEMITE) && b_inFullscreen &&
constrainedRect.size.width == screenRect.size.width
+if((OSX_MAVERICKS) && b_inFullscreen && constrainedRect.size.width ==
screenRect.size.width
&& constrainedRect.size.height != screenRect.size.height
&& fabs(screenRect.size.height - constrainedRect.size.height) <=
25.) {
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: disable native fullscreen on El Capitan
vlc/vlc-2.2 | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sat
Oct 10 16:58:01 2015 +0200| [1b2daef13663d1a72f97e6b78d783b5810094be1] |
committer: David Fuhrmann
macosx: disable native fullscreen on El Capitan
Native fullscreen seems to be on by default on El Capitan, even
if the corresponding flag is not set.
This implicitely disables the new split view feature if native
fullscreen is disabled.
close #15491
(cherry picked from commit e4ea3a00f704337a6a126362433a19c6f22e833f)
Signed-off-by: David Fuhrmann <dfuhrm...@videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=1b2daef13663d1a72f97e6b78d783b5810094be1
---
modules/gui/macosx/Windows.m |3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m
index 331da61..a8f4f78 100644
--- a/modules/gui/macosx/Windows.m
+++ b/modules/gui/macosx/Windows.m
@@ -335,6 +335,9 @@
if (b_nativeFullscreenMode) {
[self setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenPrimary];
+} else if (OSX_EL_CAPITAN) {
+// Native fullscreen seems to be default on El Capitan, this disables
it explicitely
+[self setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Introduce OSX_EL_CAPITAN runtime check
vlc/vlc-2.2 | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sat
Oct 10 16:54:34 2015 +0200| [51f8a368584c3dc33208d0f23a7486f5bf4e0b3a] |
committer: David Fuhrmann
macosx: Introduce OSX_EL_CAPITAN runtime check
(cherry picked from commit 50dcfe2ac56e9f4e8c98f1cd64076047a20ea83e)
Signed-off-by: David Fuhrmann <dfuhrm...@videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=51f8a368584c3dc33208d0f23a7486f5bf4e0b3a
---
modules/gui/macosx/CompatibilityFixes.h |4 ++--
modules/gui/macosx/MainWindowTitle.m| 10 +-
modules/gui/macosx/StringUtility.m |2 +-
modules/gui/macosx/about.m |2 +-
modules/gui/macosx/intf.m |2 +-
modules/gui/macosx/misc.m |2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/modules/gui/macosx/CompatibilityFixes.h
b/modules/gui/macosx/CompatibilityFixes.h
index d193928..56cb4e2 100644
--- a/modules/gui/macosx/CompatibilityFixes.h
+++ b/modules/gui/macosx/CompatibilityFixes.h
@@ -29,8 +29,8 @@
#define OSX_LION (NSAppKitVersionNumber < 1162 && NSAppKitVersionNumber >=
1115.2)
#define OSX_MOUNTAIN_LION (NSAppKitVersionNumber < 1244 &&
NSAppKitVersionNumber >= 1162)
#define OSX_MAVERICKS (NSAppKitVersionNumber < 1334 && NSAppKitVersionNumber
>= 1244)
-#define OSX_YOSEMITE (NSAppKitVersionNumber >= 1334)
-
+#define OSX_YOSEMITE (NSAppKitVersionNumber < 1404 && NSAppKitVersionNumber >=
1334)
+#define OSX_EL_CAPITAN (NSAppKitVersionNumber >= 1404)
#pragma mark -
#pragma Fixes for OS X Snow Leopard (10.6)
diff --git a/modules/gui/macosx/MainWindowTitle.m
b/modules/gui/macosx/MainWindowTitle.m
index edb20ca..d6799d6 100644
--- a/modules/gui/macosx/MainWindowTitle.m
+++ b/modules/gui/macosx/MainWindowTitle.m
@@ -78,7 +78,7 @@
b_nativeFullscreenMode = var_InheritBool(VLCIntf,
"macosx-nativefullscreenmode");
#endif
-if (!b_nativeFullscreenMode || OSX_YOSEMITE) {
+if (!b_nativeFullscreenMode || OSX_YOSEMITE || OSX_EL_CAPITAN) {
[o_fullscreen_btn setHidden: YES];
}
@@ -114,7 +114,7 @@
NSString *o_name = @"";
if (OSX_SNOW_LEOPARD) {
o_name = @"snowleo-";
-} else if (OSX_YOSEMITE) {
+} else if (OSX_YOSEMITE || OSX_EL_CAPITAN) {
o_name = @"yosemite-";
} else { // OSX_LION, OSX_MOUNTAIN_LION, OSX_MAVERICKS
o_name = @"lion-";
@@ -158,7 +158,7 @@
o_green_on_img = [[self getButtonImage:@"window-zoom-on"] retain];
// these files are only available in the yosemite variant
-if (OSX_YOSEMITE) {
+if (OSX_YOSEMITE || OSX_EL_CAPITAN) {
o_fullscreen_img = [[self getButtonImage:@"window-fullscreen"] retain];
o_fullscreen_over_img = [[self
getButtonImage:@"window-fullscreen-over"] retain];
o_fullscreen_on_img = [[self getButtonImage:@"window-fullscreen-on"]
retain];
@@ -193,7 +193,7 @@
{
// default image for old version, or if native fullscreen is
// disabled on yosemite, or if alt key is pressed
-if (!OSX_YOSEMITE || !b_nativeFullscreenMode || b_alt_pressed) {
+if (!(OSX_YOSEMITE || OSX_EL_CAPITAN) || !b_nativeFullscreenMode ||
b_alt_pressed) {
if (b_mouse_over) {
[o_green_btn setImage: o_green_over_img];
@@ -226,7 +226,7 @@
else if (sender == o_yellow_btn)
[[self window] miniaturize: sender];
else if (sender == o_green_btn) {
-if (OSX_YOSEMITE && b_nativeFullscreenMode && !b_alt_pressed) {
+if ((OSX_YOSEMITE || OSX_EL_CAPITAN) && b_nativeFullscreenMode &&
!b_alt_pressed) {
[[self window] toggleFullScreen:self];
} else {
[[self window] performZoom: sender];
diff --git a/modules/gui/macosx/StringUtility.m
b/modules/gui/macosx/StringUtility.m
index 37301e9..27ff1a2 100644
--- a/modules/gui/macosx/StringUtility.m
+++ b/modules/gui/macosx/StringUtility.m
@@ -398,7 +398,7 @@ NSString *toNSStr(const char *str) {
NSImage *imageFromRes(NSString *o_id)
{
NSString *result = @"";
-if (OSX_YOSEMITE) {
+if (OSX_YOSEMITE || OSX_EL_CAPITAN) {
result = [result stringByAppendingString:@"ys-"];
}
diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m
index d0d644d..54ea23d 100644
--- a/modules/gui/macosx/about.m
+++ b/modules/gui/macosx/about.m
@@ -133,7 +133,7 @@ static VLAboutBox *_o_sharedInstance = nil;
"\"http://www.videolan.org/contribute/\;>Help and join us!")];
NSString *fontfamily;
-if (OSX_YOSEMITE)
+if (OSX_YOSEMITE || OSX_EL_CAPITAN)
fontfamily = @"Helvetica Neue";
else
fontfamily = @"Lucida Grande";
di
[vlc-commits] auhal: do not add long latency to time_get callback
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Wed Sep 23
21:49:40 2015 +0200| [6f54a7591c7a257cc5cb53c0c03e47e974faa279] | committer:
David Fuhrmann
auhal: do not add long latency to time_get callback
Currently, the VLC code cannot cope with big audio device
latencies as reported by airplay devices. Thus disable the
latency calculation for those devices for now.
refs #14042
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6f54a7591c7a257cc5cb53c0c03e47e974faa279
---
modules/audio_output/auhal.c |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 5dc14f5..8b60ac0 100644
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -441,8 +441,14 @@ static int Start(audio_output_t *p_aout,
audio_sample_format_t *restrict fmt)
msg_Warn(p_aout, "Cannot get device latency [%4.4s]",
(char *));
}
-msg_Dbg(p_aout, "Current device has a latency of %u frames",
p_sys->i_device_latency);
+float f_latency_in_sec = (float)p_sys->i_device_latency /
(float)fmt->i_rate;
+msg_Dbg(p_aout, "Current device has a latency of %u frames (%f sec)",
p_sys->i_device_latency, f_latency_in_sec);
+// Ignore long Airplay latency as this is not correctly working yet
+if (f_latency_in_sec > 0.5f) {
+msg_Info(p_aout, "Ignore high latency as it causes problems
currently.");
+p_sys->i_device_latency = 0;
+}
bool b_success = false;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Update NEWS
vlc/vlc-2.2 | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Wed Sep 23 22:04:18 2015 +0200| [5232e12c88b03403e8f0dd4f69f1ee4e98eda8a1] | committer: David Fuhrmann Update NEWS > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5232e12c88b03403e8f0dd4f69f1ee4e98eda8a1 --- NEWS |2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 7dfa962..8f91959 100644 --- a/NEWS +++ b/NEWS @@ -19,6 +19,8 @@ Decoders: Audio output: * Fix audio drop after a flush with pulseaudio * Fix audio initialization on iOS + * Fix audio stuttering with AirPlay devices on OS X (2 sec delay needs to + be set manually by the user) Skins2: * Fix video control that fails to show up ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] auhal: do not add long latency to time_get callback
vlc/vlc-2.2 | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Wed
Sep 23 21:49:40 2015 +0200| [a230056b338d2739f09a87d2542596a80080405c] |
committer: David Fuhrmann
auhal: do not add long latency to time_get callback
Currently, the VLC code cannot cope with big audio device
latencies as reported by airplay devices. Thus disable the
latency calculation for those devices for now.
refs #14042
(cherry picked from commit 6f54a7591c7a257cc5cb53c0c03e47e974faa279)
Signed-off-by: David Fuhrmann <dfuhrm...@videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=a230056b338d2739f09a87d2542596a80080405c
---
modules/audio_output/auhal.c |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 10459f0..39a479e 100644
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -441,8 +441,14 @@ static int Start(audio_output_t *p_aout,
audio_sample_format_t *restrict fmt)
msg_Warn(p_aout, "Cannot get device latency [%4.4s]",
(char *));
}
-msg_Dbg(p_aout, "Current device has a latency of %u frames",
p_sys->i_device_latency);
+float f_latency_in_sec = (float)p_sys->i_device_latency /
(float)fmt->i_rate;
+msg_Dbg(p_aout, "Current device has a latency of %u frames (%f sec)",
p_sys->i_device_latency, f_latency_in_sec);
+// Ignore long Airplay latency as this is not correctly working yet
+if (f_latency_in_sec > 0.5f) {
+msg_Info(p_aout, "Ignore high latency as it causes problems
currently.");
+p_sys->i_device_latency = 0;
+}
bool b_success = false;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: squeeze preferences pane a bit to make it fit on 720p screens
vlc/vlc-2.2 | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sun Sep 20 19:26:22 2015 +0200| [0f38260842b100a6834a90f49aeabae298840215] | committer: David Fuhrmann macosx: squeeze preferences pane a bit to make it fit on 720p screens This squeezes the checkboxes in the interface section of prefs a bit, to fix problem in refs #14504. For the future, we should consider removing some of these check boxes (or move them over to the video tab). > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=0f38260842b100a6834a90f49aeabae298840215 --- .../macosx/Resources/English.lproj/Preferences.xib |26048 +--- 1 file changed, 12125 insertions(+), 13923 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=0f38260842b100a6834a90f49aeabae298840215 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix warning about missing method implementation
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sun Sep 20 14:19:40 2015 +0200| [3488ce79cf02dbbb001ef329da86d2dbd4cd25f2] | committer: David Fuhrmann macosx: fix warning about missing method implementation > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3488ce79cf02dbbb001ef329da86d2dbd4cd25f2 --- modules/gui/macosx/prefs_widgets.h | 41 ++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/modules/gui/macosx/prefs_widgets.h b/modules/gui/macosx/prefs_widgets.h index 3f8c290..5ded295 100644 --- a/modules/gui/macosx/prefs_widgets.h +++ b/modules/gui/macosx/prefs_widgets.h @@ -46,8 +46,6 @@ static NSMenu *o_keys_menu = nil; - (id)initWithFrame:(NSRect)frame item:(module_config_t *)p_item; -- (id)initWithItem:(module_config_t *)_p_item - withView:(NSView *)o_parent_view; - (void)setYPos:(int)i_yPos; - (void)alignWithXPosition:(int)i_xPos; @@ -59,62 +57,101 @@ static NSMenu *o_keys_menu = nil; @interface StringConfigControl : VLCConfigControl +- (id)initWithItem:(module_config_t *)_p_item + withView:(NSView *)o_parent_view; + @end @interface StringListConfigControl : VLCConfigControl +- (id)initWithItem:(module_config_t *)_p_item + withView:(NSView *)o_parent_view; + @end @interface FileConfigControl : VLCConfigControl +- (id)initWithItem:(module_config_t *)_p_item + withView:(NSView *)o_parent_view; + - (IBAction)openFileDialog:(id)sender; @end @interface ModuleConfigControl : VLCConfigControl +- (id)initWithItem:(module_config_t *)_p_item + withView:(NSView *)o_parent_view; + @end @interface IntegerConfigControl : VLCConfigControl +- (id)initWithItem:(module_config_t *)_p_item + withView:(NSView *)o_parent_view; + - (IBAction)stepperChanged:(id)sender; @end @interface IntegerListConfigControl : VLCConfigControl +- (id)initWithItem:(module_config_t *)_p_item + withView:(NSView *)o_parent_view; + @end @interface RangedIntegerConfigControl : VLCConfigControl +- (id)initWithItem:(module_config_t *)_p_item + withView:(NSView *)o_parent_view; + - (IBAction)sliderChanged:(id)sender; @end @interface BoolConfigControl : VLCConfigControl +- (id)initWithItem:(module_config_t *)_p_item + withView:(NSView *)o_parent_view; + @end @interface FloatConfigControl : VLCConfigControl +- (id)initWithItem:(module_config_t *)_p_item + withView:(NSView *)o_parent_view; + - (IBAction)stepperChanged:(id)sender; @end @interface RangedFloatConfigControl : VLCConfigControl +- (id)initWithItem:(module_config_t *)_p_item + withView:(NSView *)o_parent_view; + - (IBAction)sliderChanged:(id)sender; @end @interface KeyConfigControl : VLCConfigControl +- (id)initWithItem:(module_config_t *)_p_item + withView:(NSView *)o_parent_view; + @end @interface ModuleListConfigControl : VLCConfigControl +- (id)initWithItem:(module_config_t *)_p_item + withView:(NSView *)o_parent_view; + @end @interface SectionControl : VLCConfigControl +- (id)initWithItem:(module_config_t *)_p_item + withView:(NSView *)o_parent_view; + @end ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: use var_Inherit* for large text setting
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sun Sep 20
14:19:18 2015 +0200| [177679d44a39b19206e7a5eb536e69a49e8bd65c] | committer:
David Fuhrmann
macosx: use var_Inherit* for large text setting
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=177679d44a39b19206e7a5eb536e69a49e8bd65c
---
modules/gui/macosx/playlist.m |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index ce1a074..923253d 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -109,7 +109,7 @@
{
NSFont *fontToUse;
CGFloat rowHeight;
-if (config_GetInt(VLCIntf, "macosx-large-text")) {
+if (var_InheritBool(VLCIntf, "macosx-large-text")) {
fontToUse = [NSFont systemFontOfSize:13.];
rowHeight = 21.;
} else {
@@ -658,7 +658,7 @@
playlist_t *p_playlist = pl_Get(p_intf);
NSFont *fontToUse;
-if (config_GetInt(VLCIntf, "macosx-large-text"))
+if (var_InheritBool(VLCIntf, "macosx-large-text"))
fontToUse = [NSFont systemFontOfSize:13.];
else
fontToUse = [NSFont systemFontOfSize:11.];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix double free in advanced preferences dialog
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sun Sep 20
14:32:07 2015 +0200| [12e0e57903f00c15fe67f2f2a95785124da2] | committer:
David Fuhrmann
macosx: fix double free in advanced preferences dialog
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=12e0e57903f00c15fe67f2f2a95785124da2
---
modules/gui/macosx/prefs_widgets.m |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/modules/gui/macosx/prefs_widgets.m
b/modules/gui/macosx/prefs_widgets.m
index abb1051..8ed1667 100644
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -387,7 +387,7 @@ o_textfield = [[NSSecureTextField alloc] initWithFrame:
s_rc]; \
@interface VLCConfigControl()
{
-char*psz_name;
+const char *psz_name;
}
@end
@@ -421,11 +421,6 @@ o_textfield = [[NSSecureTextField alloc] initWithFrame:
s_rc]; \
[self setFrame:frame];
}
-- (void)dealloc
-{
-free(psz_name);
-}
-
+ (int)calcVerticalMargin:(int)i_curItem lastItem:(int)i_lastItem
{
int i_margin;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix reversed order of advanced prefs items (close #15493)
vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sun Sep 20
15:30:28 2015 +0200| [e35efa48841e22b967c755d755244acaaa71938b] | committer:
David Fuhrmann
macosx: fix reversed order of advanced prefs items (close #15493)
This reverts code which was deleted for no reason. :-)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e35efa48841e22b967c755d755244acaaa71938b
---
modules/gui/macosx/prefs.m | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index 0f6f8b1..7d6b976 100644
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -68,6 +68,18 @@
/* /!\ Warning: Unreadable code :/ */
+@interface VLCFlippedView : NSView
+@end
+
+@implementation VLCFlippedView
+
+- (BOOL)isFlipped
+{
+return YES;
+}
+
+@end
+
@interface VLCTreeItem : NSObject
{
NSString *_name;
@@ -302,7 +314,7 @@
[self.prefsViewController setTitle: [self name]];
s_vrc = [[prefsView contentView] bounds]; s_vrc.size.height -= 4;
-view = [[NSView alloc] initWithFrame: s_vrc];
+view = [[VLCFlippedView alloc] initWithFrame: s_vrc];
[view setAutoresizingMask: NSViewWidthSizable | NSViewMinYMargin |
NSViewMaxYMargin];
if (!_subviews) {
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix coredialog provider, fix dialog initialization
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 30 00:37:26 2015 +0200| [4aa458cd44857104857432804091149e1831c333] | committer: David Fuhrmann macosx: fix coredialog provider, fix dialog initialization This removes the singleton, fixes the xib, and initializes the dialog provider class at the correct time. dialog_Register will be called only once now. http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4aa458cd44857104857432804091149e1831c333 --- .../macosx/Resources/English.lproj/CoreDialogs.xib | 161 ++-- modules/gui/macosx/ExtensionsDialogProvider.m |2 +- modules/gui/macosx/coredialogs.h |1 - modules/gui/macosx/coredialogs.m | 77 +- modules/gui/macosx/intf.m | 10 +- 5 files changed, 124 insertions(+), 127 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=4aa458cd44857104857432804091149e1831c333 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: remove stray variables, fix include
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 30
20:44:17 2015 +0200| [6f3da59e056dfdb5278132ceb427c0822ec50de3] | committer:
David Fuhrmann
macosx: remove stray variables, fix include
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6f3da59e056dfdb5278132ceb427c0822ec50de3
---
modules/gui/macosx/MainMenu.m |2 --
modules/gui/macosx/intf-prefs.m |2 ++
modules/gui/macosx/intf.m |4
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index 77e656b..83ae929 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -54,8 +54,6 @@
@interface VLCMainMenu()
{
-BOOL b_nib_bookmarks_loaded;
-
AboutWindowController *_aboutWindowController;
HelpWindowController *_helpWindowController;
AddonsWindowController *_addonsController;
diff --git a/modules/gui/macosx/intf-prefs.m b/modules/gui/macosx/intf-prefs.m
index f4b2d0e..89c7c3f 100644
--- a/modules/gui/macosx/intf-prefs.m
+++ b/modules/gui/macosx/intf-prefs.m
@@ -26,6 +26,8 @@
#import intf-prefs.h
#import CoreInteraction.h
+#include unistd.h /* execl() */
+
@implementation VLCMain(OldPrefs)
static NSString * kVLCPreferencesVersion = @VLCPreferencesVersion;
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 252883f..dd9bc66 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -42,8 +42,6 @@
#include vlc_url.h
#include vlc_variables.h
-#include unistd.h /* execl() */
-
#import CompatibilityFixes.h
#import InputManager.h
#import MainMenu.h
@@ -153,11 +151,9 @@ static int ShowController(vlc_object_t *p_this, const char
*psz_variable,
BOOL launched;
int items_at_launch;
-BOOL nib_about_loaded; /* about nibfile */
BOOL b_active_videoplayback;
NSWindowController *_mainWindowController;
-
VLCMainMenu *_mainmenu;
VLCPrefs *_prefs;
VLCSimplePrefs *_sprefs;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] nsspeechsynthesizer: drop priority to 0
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 23 16:54:19 2015 +0200| [8fb13a450fd6384398d5ac7ce8cf997999b6ee2f] | committer: David Fuhrmann nsspeechsynthesizer: drop priority to 0 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8fb13a450fd6384398d5ac7ce8cf997999b6ee2f --- modules/text_renderer/nsspeechsynthesizer.m |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/text_renderer/nsspeechsynthesizer.m b/modules/text_renderer/nsspeechsynthesizer.m index 47101f0..6d4bc87 100644 --- a/modules/text_renderer/nsspeechsynthesizer.m +++ b/modules/text_renderer/nsspeechsynthesizer.m @@ -47,7 +47,7 @@ set_description(N_(Speech synthesis for Mac OS X)) set_category(CAT_VIDEO) set_subcategory(SUBCAT_VIDEO_SUBPIC) -set_capability(text renderer, 50) +set_capability(text renderer, 0) set_callbacks(Create, Destroy) vlc_module_end () ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: add tp file extension (close #15329)
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 23 16:58:54 2015 +0200| [b1d06242eedcd85ea59ed5697ecc853d21a062fe] | committer: David Fuhrmann macosx: add tp file extension (close #15329) tp is another extension for ts. http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b1d06242eedcd85ea59ed5697ecc853d21a062fe --- extras/package/macosx/Info.plist.in |2 ++ 1 file changed, 2 insertions(+) diff --git a/extras/package/macosx/Info.plist.in b/extras/package/macosx/Info.plist.in index 520bc15..2f80fbc 100644 --- a/extras/package/macosx/Info.plist.in +++ b/extras/package/macosx/Info.plist.in @@ -912,6 +912,7 @@ /array keyCFBundleTypeExtensions/key array + stringtp/string stringts/string stringm2ts/string stringmts/string @@ -2218,6 +2219,7 @@ array stringm2p/string stringps/string + stringtp/string stringts/string stringm2ts/string stringmts/string ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: avoid zombie when updating extensions dialog
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Wed Aug 12
13:20:38 2015 +0200| [f54301b602e9b17ed1ddeba869a7cd972b1470b3] | committer:
David Fuhrmann
macosx: avoid zombie when updating extensions dialog
CFBridgingRelease was used in the wrong place.
All view objects should only be retained by the window (and in this
situation by the grid view dicts as well), thus they is no need to
additionally retain them for the p_sys_intf pointer.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f54301b602e9b17ed1ddeba869a7cd972b1470b3
---
modules/gui/macosx/ExtensionsDialogProvider.m |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/gui/macosx/ExtensionsDialogProvider.m
b/modules/gui/macosx/ExtensionsDialogProvider.m
index ba1abd1..518aa98 100644
--- a/modules/gui/macosx/ExtensionsDialogProvider.m
+++ b/modules/gui/macosx/ExtensionsDialogProvider.m
@@ -382,13 +382,13 @@ static int extensionDialogCallback(vlc_object_t *p_this,
const char *psz_variabl
continue; /* Some widgets may be NULL@this point */
BOOL shouldDestroy = widget-b_kill;
-NSView *control = CFBridgingRelease(widget-p_sys_intf);
+NSView *control = (__bridge NSView *)widget-p_sys_intf;
BOOL update = widget-b_update;
if (!control !shouldDestroy) {
control = createControlFromWidget(widget, self);
updateControlFromWidget(control, widget, self);
-widget-p_sys_intf = (void *)CFBridgingRetain(control);
+widget-p_sys_intf = (__bridge void *)control;
update = YES; // Force update and repositionning
[control setHidden:widget-b_hide];
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: sharedDialogs: rename properties for l10n strings
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Tue Aug 11
10:22:41 2015 +0200| [858e2e65103f88d291653c50e904840d61de55a4] | committer:
David Fuhrmann
macosx: sharedDialogs: rename properties for l10n strings
This should make it clearer what a l10n string and a IBOutlet is.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=858e2e65103f88d291653c50e904840d61de55a4
---
modules/gui/macosx/AudioEffects.m | 32
modules/gui/macosx/ConvertAndSave.m | 16
modules/gui/macosx/SharedDialogs.h | 16
modules/gui/macosx/SharedDialogs.m | 16
modules/gui/macosx/VideoEffects.m | 16
5 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/modules/gui/macosx/AudioEffects.m
b/modules/gui/macosx/AudioEffects.m
index 2dc8ecb..c0dde23 100644
--- a/modules/gui/macosx/AudioEffects.m
+++ b/modules/gui/macosx/AudioEffects.m
@@ -361,10 +361,10 @@
- (void)addAudioEffectsProfile:(id)sender
{
/* show panel */
-[_textfieldPanel setTitle: _NS(Duplicate current profile for a new
profile)];
-[_textfieldPanel setSubTitle: _NS(Enter a name for the new profile:)];
-[_textfieldPanel setCancelButtonLabel: _NS(Cancel)];
-[_textfieldPanel setOKButtonLabel: _NS(Save)];
+[_textfieldPanel setTitleString:_NS(Duplicate current profile for a new
profile)];
+[_textfieldPanel setSubTitleString:_NS(Enter a name for the new
profile:)];
+[_textfieldPanel setCancelButtonString:_NS(Cancel)];
+[_textfieldPanel setOkButtonString:_NS(Save)];
__weak typeof(self) _self = self;
[_textfieldPanel runModalForWindow:self.window
completionHandler:^(NSInteger returnCode, NSString *resultingText) {
@@ -414,10 +414,10 @@
- (void)removeAudioEffectsProfile:(id)sender
{
/* show panel */
-[_popupPanel setTitle:_NS(Remove a preset)];
-[_popupPanel setSubTitle:_NS(Select the preset you would like to
remove:)];
-[_popupPanel setOKButtonLabel:_NS(Remove)];
-[_popupPanel setCancelButtonLabel:_NS(Cancel)];
+[_popupPanel setTitleString:_NS(Remove a preset)];
+[_popupPanel setSubTitleString:_NS(Select the preset you would like to
remove:)];
+[_popupPanel setOkButtonString:_NS(Remove)];
+[_popupPanel setCancelButtonString:_NS(Cancel)];
[_popupPanel setPopupButtonContent:[[NSUserDefaults standardUserDefaults]
objectForKey:@AudioEffectProfileNames]];
__weak typeof(self) _self = self;
@@ -661,10 +661,10 @@ static bool GetEqualizerStatus(intf_thread_t
*p_custom_intf,
- (IBAction)addPresetAction:(id)sender
{
/* show panel */
-[_textfieldPanel setTitle: _NS(Save current selection as new preset)];
-[_textfieldPanel setSubTitle: _NS(Enter a name for the new preset:)];
-[_textfieldPanel setCancelButtonLabel: _NS(Cancel)];
-[_textfieldPanel setOKButtonLabel: _NS(Save)];
+[_textfieldPanel setTitleString:_NS(Save current selection as new
preset)];
+[_textfieldPanel setSubTitleString:_NS(Enter a name for the new
preset:)];
+[_textfieldPanel setCancelButtonString:_NS(Cancel)];
+[_textfieldPanel setOkButtonString:_NS(Save)];
__weak typeof(self) _self = self;
[_textfieldPanel runModalForWindow:self.window
completionHandler:^(NSInteger returnCode, NSString *resultingText) {
@@ -704,10 +704,10 @@ static bool GetEqualizerStatus(intf_thread_t
*p_custom_intf,
- (IBAction)deletePresetAction:(id)sender
{
-[_popupPanel setTitle:_NS(Remove a preset)];
-[_popupPanel setSubTitle:_NS(Select the preset you would like to
remove:)];
-[_popupPanel setOKButtonLabel:_NS(Remove)];
-[_popupPanel setCancelButtonLabel:_NS(Cancel)];
+[_popupPanel setTitleString:_NS(Remove a preset)];
+[_popupPanel setSubTitleString:_NS(Select the preset you would like to
remove:)];
+[_popupPanel setOkButtonString:_NS(Remove)];
+[_popupPanel setCancelButtonString:_NS(Cancel)];
[_popupPanel setPopupButtonContent:[[NSUserDefaults standardUserDefaults]
objectForKey:@EQTitles]];
__weak typeof(self) _self = self;
diff --git a/modules/gui/macosx/ConvertAndSave.m
b/modules/gui/macosx/ConvertAndSave.m
index ad6a76f..08f543b 100644
--- a/modules/gui/macosx/ConvertAndSave.m
+++ b/modules/gui/macosx/ConvertAndSave.m
@@ -329,10 +329,10 @@
- (IBAction)deleteProfileAction:(id)sender
{
/* show panel */
-[_popupPanel setTitle:_NS(Remove a profile)];
-[_popupPanel setSubTitle:_NS(Select the profile you would like to
remove:)];
-[_popupPanel setOKButtonLabel:_NS(Remove)];
-[_popupPanel setCancelButtonLabel:_NS(Cancel)];
+[_popupPanel setTitleString:_NS(Remove a profile)];
+[_popupPanel setSubTitleString:_NS(Select the profile you would like to
remove:)];
+[_popupPanel setOkButtonString:_NS(Remove)];
+[_popupPanel setCancelButtonString:_NS(Cancel)];
[_popupPanel setPopupButtonContent:self.profileNames];
__weak typeof(self) _self = self
[vlc-commits] macosx: TextfieldPanel: change result handling from delegate to block
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Tue Aug 11 09:42:03 2015 +0200| [2609901edfe4f615eef778b0b46c4ffdc5da5f88] | committer: David Fuhrmann macosx: TextfieldPanel: change result handling from delegate to block The former delegate approach had some drawbacks as one class could be only delegate for one panel. This commit replaces it with a completion handler block which moves the result handling code closer to the actual creation of the dialog. Also fixes crash for eq panels. http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2609901edfe4f615eef778b0b46c4ffdc5da5f88 --- modules/gui/macosx/AudioEffects.m | 156 +-- modules/gui/macosx/ConvertAndSave.h |1 - modules/gui/macosx/ConvertAndSave.m | 54 ++-- modules/gui/macosx/SharedDialogs.h | 20 +++-- modules/gui/macosx/SharedDialogs.m | 26 +++--- modules/gui/macosx/VideoEffects.m | 74 - 6 files changed, 160 insertions(+), 171 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=2609901edfe4f615eef778b0b46c4ffdc5da5f88 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: popup panel: switch from delegate to completion block
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Tue Aug 11 10:13:06 2015 +0200| [0b2f47e8e9ef585e3db94e0e2ec711e8de51dd59] | committer: David Fuhrmann macosx: popup panel: switch from delegate to completion block Also fixes behaviour for eq profile list http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0b2f47e8e9ef585e3db94e0e2ec711e8de51dd59 --- modules/gui/macosx/AudioEffects.m | 107 --- modules/gui/macosx/ConvertAndSave.h |2 - modules/gui/macosx/ConvertAndSave.m | 44 +++--- modules/gui/macosx/SharedDialogs.h | 21 --- modules/gui/macosx/SharedDialogs.m | 25 modules/gui/macosx/VideoEffects.m | 48 6 files changed, 118 insertions(+), 129 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=0b2f47e8e9ef585e3db94e0e2ec711e8de51dd59 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Split GoToTime panel into separate xib and window controller
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Tue Aug 11 15:20:02 2015 +0200| [ffe31745fc135c972b7eb0ec6366df2bffdfcb7d] | committer: David Fuhrmann macosx: Split GoToTime panel into separate xib and window controller This improves separation between main menu and the unrelated goto time window. Besides that, note that each time bindings are used with the file owner, this owner needs to be an NSWindowController class. Only in this case retain cycles are avoided (bindings have a strong reference to the object used). Thus, this commit helps to properly deinitialize the VLCMain object. http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ffe31745fc135c972b7eb0ec6366df2bffdfcb7d --- Makefile.am|1 + .../macosx/Resources/English.lproj/MainMenu.xib| 89 + .../Resources/English.lproj/TimeSelectionPanel.xib | 101 .../package/macosx/vlc.xcodeproj/project.pbxproj | 18 modules/gui/macosx/MainMenu.h |9 -- modules/gui/macosx/MainMenu.m | 76 +-- modules/gui/macosx/Makefile.am |1 + .../gui/macosx/VLCTimeSelectionPanelController.h | 53 ++ .../gui/macosx/VLCTimeSelectionPanelController.m | 98 +++ po/POTFILES.in |2 + 10 files changed, 304 insertions(+), 144 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=ffe31745fc135c972b7eb0ec6366df2bffdfcb7d ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: manage main window with an NSWindowController, simplify VLCMain
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Tue Aug 11 18:56:23 2015 +0200| [e5940f08f1f77df53b3c4db13ac5e6fe66edb1dc] | committer: David Fuhrmann macosx: manage main window with an NSWindowController, simplify VLCMain The window controller ensures that all top-level objects of the mainwindow xib are properly released. This removes the last occurence of VLCMain in xib files, thus awakeFromNib will not be called for this object anymore. The code has been moved to initThis removes the last occurence of VLCMain in xib files, thus awakeFromNib will not be called for this object anymore. The code has been moved to init. http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e5940f08f1f77df53b3c4db13ac5e6fe66edb1dc --- .../macosx/Resources/English.lproj/MainWindow.xib | 20 ++-- modules/gui/macosx/InputManager.m |2 +- modules/gui/macosx/intf.h |7 +- modules/gui/macosx/intf.m | 122 +--- 4 files changed, 67 insertions(+), 84 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=e5940f08f1f77df53b3c4db13ac5e6fe66edb1dc ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: deinit VLCMain, fix retain cycles for InputManager and playlist
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Tue Aug 11
14:10:23 2015 +0200| [39c71bd769443f271471a7c3420265d4b8907b6c] | committer:
David Fuhrmann
macosx: deinit VLCMain, fix retain cycles for InputManager and playlist
By deinitializing VLCMain, all connected objects are supposed to
be deallocated automatically. If [VLCMain sharedInstance] is gone,
the intf is deinitalized (this was previously checked with a
nil value of VLCIntf).
Fixes some retain cycles in input manager and playlist code which
prevented these objects to be deinitalized.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=39c71bd769443f271471a7c3420265d4b8907b6c
---
modules/gui/macosx/InputManager.m |2 +-
modules/gui/macosx/PLModel.m |4 ++--
modules/gui/macosx/intf.h |2 ++
modules/gui/macosx/intf.m | 11 ---
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/modules/gui/macosx/InputManager.m
b/modules/gui/macosx/InputManager.m
index e435a58..261abee 100644
--- a/modules/gui/macosx/InputManager.m
+++ b/modules/gui/macosx/InputManager.m
@@ -133,7 +133,7 @@ static int InputEvent(vlc_object_t *p_this, const char
*psz_var,
@interface VLCInputManager()
{
-VLCMain *o_main;
+__weak VLCMain *o_main;
input_thread_t *p_current_input;
dispatch_queue_t informInputChangedQueue;
diff --git a/modules/gui/macosx/PLModel.m b/modules/gui/macosx/PLModel.m
index b31b794..1497c1d 100644
--- a/modules/gui/macosx/PLModel.m
+++ b/modules/gui/macosx/PLModel.m
@@ -106,10 +106,10 @@ static int VolumeUpdated(vlc_object_t *p_this, const char
*psz_var,
@interface PLModel ()
{
playlist_t *p_playlist;
-NSOutlineView *_outlineView;
+__weak NSOutlineView *_outlineView;
// TODO: for transition
-VLCPlaylist *_playlist;
+__weak VLCPlaylist *_playlist;
NSUInteger _retainedRowSelection;
}
@end
diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 9ae31fc..7bd4214 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -78,7 +78,9 @@ static NSString * VLCInputChangedNotification =
@VLCInputChangedNotification;
@property (readonly) VLCVoutWindowController* voutController;
@property (readonly) BOOL nativeFullscreenMode;
@property (nonatomic, readwrite) BOOL playlistUpdatedSelectorInQueue;
+
+ (VLCMain *)sharedInstance;
++ (void)killInstance;
- (intf_thread_t *)intf;
- (void)setIntf:(intf_thread_t *)p_mainintf;
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 23d39b8..d91197b 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -97,6 +97,7 @@ void CloseIntf (vlc_object_t *p_this)
@autoreleasepool {
msg_Dbg(p_this, Closing macosx interface);
[[VLCMain sharedInstance] applicationWillTerminate:nil];
+[VLCMain killInstance];
}
}
@@ -174,9 +175,10 @@ static int ShowController(vlc_object_t *p_this, const char
*psz_variable,
#pragma mark -
#pragma mark Initialization
+static VLCMain *sharedInstance = nil;
+
+ (VLCMain *)sharedInstance
{
-static VLCMain *sharedInstance = nil;
static dispatch_once_t pred;
dispatch_once(pred, ^{
@@ -186,6 +188,11 @@ static int ShowController(vlc_object_t *p_this, const char
*psz_variable,
return sharedInstance;
}
++ (void)killInstance
+{
+sharedInstance = nil;
+}
+
- (id)init
{
self = [super init];
@@ -374,8 +381,6 @@ static int ShowController(vlc_object_t *p_this, const char
*psz_variable,
[[NSUserDefaults standardUserDefaults] synchronize];
o_mainwindow = NULL;
-
-[self setIntf:nil];
}
#pragma mark -
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: remove VLCMainWindow singleton
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Tue Aug 11 12:44:49 2015 +0200| [c500901b0ff8b12414db9629069bae5d79be44a5] | committer: David Fuhrmann macosx: remove VLCMainWindow singleton http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c500901b0ff8b12414db9629069bae5d79be44a5 --- modules/gui/macosx/AddonsWindowController.m |2 +- modules/gui/macosx/MainMenu.m|4 ++-- modules/gui/macosx/MainWindow.h |2 +- modules/gui/macosx/MainWindow.m | 23 --- modules/gui/macosx/VLCVoutWindowController.m | 22 +++--- modules/gui/macosx/VideoView.m |2 +- modules/gui/macosx/Windows.m | 26 +- 7 files changed, 29 insertions(+), 52 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=c500901b0ff8b12414db9629069bae5d79be44a5 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: set window delegate for messages panel, remove singleton
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 9
18:26:03 2015 +0200| [beab9340fc8ce1362dfb95efefce5091d0b06091] | committer:
David Fuhrmann
macosx: set window delegate for messages panel, remove singleton
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=beab9340fc8ce1362dfb95efefce5091d0b06091
---
.../Resources/English.lproj/DebugMessageVisualizer.xib | 12 ++--
modules/gui/macosx/DebugMessageVisualizer.h|1 -
modules/gui/macosx/DebugMessageVisualizer.m| 12
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git
a/extras/package/macosx/Resources/English.lproj/DebugMessageVisualizer.xib
b/extras/package/macosx/Resources/English.lproj/DebugMessageVisualizer.xib
index a35e4f1..5a8c27f 100644
--- a/extras/package/macosx/Resources/English.lproj/DebugMessageVisualizer.xib
+++ b/extras/package/macosx/Resources/English.lproj/DebugMessageVisualizer.xib
@@ -2,7 +2,7 @@
archive type=com.apple.InterfaceBuilder3.Cocoa.XIB version=8.00
data
int key=IBDocument.SystemTarget1060/int
- string key=IBDocument.SystemVersion14F6a/string
+ string key=IBDocument.SystemVersion14F25a/string
string key=IBDocument.InterfaceBuilderVersion7706/string
string key=IBDocument.AppKitVersion1348.17/string
string key=IBDocument.HIToolboxVersion758.70/string
@@ -325,6 +325,14 @@
/object
object class=IBConnectionRecord
object class=IBOutletConnection
key=connection
+ string
key=labeldelegate/string
+ reference key=source
ref=401114513/
+ reference key=destination
ref=1001/
+ /object
+ int key=connectionID25/int
+ /object
+ object class=IBConnectionRecord
+ object class=IBOutletConnection
key=connection
string
key=labeldataSource/string
reference key=source
ref=277989700/
reference key=destination
ref=1001/
@@ -476,7 +484,7 @@
nil key=activeLocalization/
dictionary class=NSMutableDictionary
key=localizations/
nil key=sourceID/
- int key=maxID24/int
+ int key=maxID25/int
/object
object class=IBClassDescriber key=IBDocument.Classes
array class=NSMutableArray
key=referencedPartialClassDescriptions
diff --git a/modules/gui/macosx/DebugMessageVisualizer.h
b/modules/gui/macosx/DebugMessageVisualizer.h
index 225174e..1b1ba23 100644
--- a/modules/gui/macosx/DebugMessageVisualizer.h
+++ b/modules/gui/macosx/DebugMessageVisualizer.h
@@ -31,7 +31,6 @@
IBOutlet NSButton * _msgs_refresh_btn;
IBOutlet id _msgs_table;
}
-+ (VLCDebugMessageVisualizer *)sharedInstance;
- (void)showWindow:(id)sender;
diff --git a/modules/gui/macosx/DebugMessageVisualizer.m
b/modules/gui/macosx/DebugMessageVisualizer.m
index b784045..d832d12 100644
--- a/modules/gui/macosx/DebugMessageVisualizer.m
+++ b/modules/gui/macosx/DebugMessageVisualizer.m
@@ -67,18 +67,6 @@ static void MsgCallback(void *data, int type, const
vlc_log_t *item, const char
@implementation VLCDebugMessageVisualizer
-+ (VLCDebugMessageVisualizer *)sharedInstance
-{
-static VLCDebugMessageVisualizer *sharedInstance = nil;
-static dispatch_once_t pred;
-
-dispatch_once(pred, ^{
-sharedInstance = [VLCDebugMessageVisualizer new];
-});
-
-return sharedInstance;
-}
-
- (id)init
{
self = [super initWithWindowNibName:@DebugMessageVisualizer];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Modernize and fix shared dialog panels
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 9
19:53:49 2015 +0200| [4da13fbc669110b24a4e3b541c91dd97304d6eac] | committer:
David Fuhrmann
macosx: Modernize and fix shared dialog panels
Splits PopupPanel and TextfieldPanel into two xib files and
creates NSWindowController subclasses for each panel.
Each user of the panel gets its own window controller instance.
This is needed as the same kind of window can be shown multiple
times simultaneously (e.g. both in video and audio effects).
This also did not work with the previous implementation of the
2.2 branch and fixes broken behaviour.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4da13fbc669110b24a4e3b541c91dd97304d6eac
---
Makefile.am|3 +-
.../{SharedDialogs.xib = PopupPanel.xib} | 539 +++-
.../Resources/English.lproj/TextfieldPanel.xib | 659
.../package/macosx/vlc.xcodeproj/project.pbxproj | 46 +-
modules/gui/macosx/AudioEffects.h |6 +
modules/gui/macosx/AudioEffects.m | 39 +-
modules/gui/macosx/ConvertAndSave.h| 11 +-
modules/gui/macosx/ConvertAndSave.m| 43 +-
modules/gui/macosx/SharedDialogs.h | 42 +-
modules/gui/macosx/SharedDialogs.m | 76 ++-
modules/gui/macosx/VideoEffects.h |6 +
modules/gui/macosx/VideoEffects.m | 39 +-
12 files changed, 915 insertions(+), 594 deletions(-)
Diff:
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=4da13fbc669110b24a4e3b541c91dd97304d6eac
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: reorder and group CAS panel actions
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Wed Aug 5
17:04:19 2015 +0200| [d9923568893b3f56709c1fc4f5045fed291b2197] | committer:
David Fuhrmann
macosx: reorder and group CAS panel actions
No functional changes.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d9923568893b3f56709c1fc4f5045fed291b2197
---
modules/gui/macosx/ConvertAndSave.h | 17 +++---
modules/gui/macosx/ConvertAndSave.m | 110 ---
2 files changed, 70 insertions(+), 57 deletions(-)
diff --git a/modules/gui/macosx/ConvertAndSave.h
b/modules/gui/macosx/ConvertAndSave.h
index 6488964..70bc4bc 100644
--- a/modules/gui/macosx/ConvertAndSave.h
+++ b/modules/gui/macosx/ConvertAndSave.h
@@ -143,13 +143,18 @@
- (IBAction)finalizePanel:(id)sender;
- (IBAction)openMedia:(id)sender;
- (IBAction)switchProfile:(id)sender;
-- (IBAction)customizeProfile:(id)sender;
-- (IBAction)closeCustomizationSheet:(id)sender;
-- (IBAction)newProfileAction:(id)sender;
- (IBAction)iWantAFile:(id)sender;
- (IBAction)iWantAStream:(id)sender;
- (IBAction)cancelDestination:(id)sender;
- (IBAction)browseFileDestination:(id)sender;
+
+- (IBAction)customizeProfile:(id)sender;
+- (IBAction)closeCustomizationSheet:(id)sender;
+- (IBAction)videoSettingsChanged:(id)sender;
+- (IBAction)audioSettingsChanged:(id)sender;
+- (IBAction)subSettingsChanged:(id)sender;
+- (IBAction)newProfileAction:(id)sender;
+
- (IBAction)showStreamPanel:(id)sender;
- (IBAction)closeStreamPanel:(id)sender;
- (IBAction)streamTypeToggle:(id)sender;
@@ -159,10 +164,4 @@
- (void)panel:(VLCEnterTextPanel *)panel returnValue:(NSUInteger)value
text:(NSString *)text;
- (void)panel:(VLCSelectItemInPopupPanel *)panel returnValue:(NSUInteger)value
item:(NSUInteger)item;
-- (IBAction)videoSettingsChanged:(id)sender;
-- (IBAction)audioSettingsChanged:(id)sender;
-- (IBAction)subSettingsChanged:(id)sender;
-
-- (void)updateDropView;
-
@end
diff --git a/modules/gui/macosx/ConvertAndSave.m
b/modules/gui/macosx/ConvertAndSave.m
index 60a72a8..a56adff 100644
--- a/modules/gui/macosx/ConvertAndSave.m
+++ b/modules/gui/macosx/ConvertAndSave.m
@@ -250,7 +250,7 @@
}
# pragma mark -
-# pragma mark User Interaction
+# pragma mark User Interaction - main window
- (IBAction)finalizePanel:(id)sender
{
@@ -322,32 +322,6 @@
[self resetCustomizationSheetBasedOnProfile:[self.profileValueList
objectAtIndex:index]];
}
-- (IBAction)customizeProfile:(id)sender
-{
-[NSApp beginSheet:_customizePanel modalForWindow:self.window
modalDelegate:self didEndSelector:NULL contextInfo:nil];
-}
-
-- (IBAction)closeCustomizationSheet:(id)sender
-{
-[_customizePanel orderOut:sender];
-[NSApp endSheet: _customizePanel];
-
-if (sender == _customizeOkButton)
-[self updateCurrentProfile];
-}
-
-- (IBAction)newProfileAction:(id)sender
-{
-/* show panel */
-VLCEnterTextPanel * panel = [VLCEnterTextPanel sharedInstance];
-[panel setTitle: _NS(Save as new profile)];
-[panel setSubTitle: _NS(Enter a name for the new profile:)];
-[panel setCancelButtonLabel: _NS(Cancel)];
-[panel setOKButtonLabel: _NS(Save)];
-[panel setTarget:self];
-
-[panel runModalForWindow:_customizePanel];
-}
- (IBAction)deleteProfileAction:(id)sender
{
@@ -428,6 +402,63 @@
}];
}
+#pragma mark -
+#pragma mark User interaction - customization panel
+
+- (IBAction)customizeProfile:(id)sender
+{
+[NSApp beginSheet:_customizePanel modalForWindow:self.window
modalDelegate:self didEndSelector:NULL contextInfo:nil];
+}
+
+- (IBAction)closeCustomizationSheet:(id)sender
+{
+[_customizePanel orderOut:sender];
+[NSApp endSheet: _customizePanel];
+
+if (sender == _customizeOkButton)
+[self updateCurrentProfile];
+}
+
+
+
+- (IBAction)videoSettingsChanged:(id)sender
+{
+bool enableSettings = [_customizeVidCheckbox state] == NSOnState
[_customizeVidKeepCheckbox state] == NSOffState;
+[_customizeVidSettingsBox enableSubviews:enableSettings];
+[_customizeVidKeepCheckbox setEnabled:[_customizeVidCheckbox state] ==
NSOnState];
+}
+
+- (IBAction)audioSettingsChanged:(id)sender
+{
+bool enableSettings = [_customizeAudCheckbox state] == NSOnState
[_customizeAudKeepCheckbox state] == NSOffState;
+[_customizeAudSettingsBox enableSubviews:enableSettings];
+[_customizeAudKeepCheckbox setEnabled:[_customizeAudCheckbox state] ==
NSOnState];
+}
+
+- (IBAction)subSettingsChanged:(id)sender
+{
+bool enableSettings = [_customizeSubsCheckbox state] == NSOnState;
+[_customizeSubsOverlayCheckbox setEnabled:enableSettings];
+[_customizeSubsPopup setEnabled:enableSettings];
+}
+
+
+- (IBAction)newProfileAction:(id)sender
+{
+/* show panel */
+VLCEnterTextPanel * panel = [VLCEnterTextPanel sharedInstance];
+[panel setTitle: _NS(Save as new profile)];
+[panel setSubTitle: _NS(Enter a name for the new profile:)];
+[panel setCancelButtonLabel: _NS(Cancel
[vlc-commits] macosx: convert cas to NSWindowController subclass, remove singleton
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Wed Aug 5
16:37:52 2015 +0200| [91e3caa67669c95b1ef38d3a241daabd3e21ee29] | committer:
David Fuhrmann
macosx: convert cas to NSWindowController subclass, remove singleton
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=91e3caa67669c95b1ef38d3a241daabd3e21ee29
---
modules/gui/macosx/ConvertAndSave.h |7 +--
modules/gui/macosx/ConvertAndSave.m | 37 ---
modules/gui/macosx/MainMenu.m | 10 +-
modules/gui/macosx/intf.h |3 +++
modules/gui/macosx/intf.m | 10 ++
5 files changed, 27 insertions(+), 40 deletions(-)
diff --git a/modules/gui/macosx/ConvertAndSave.h
b/modules/gui/macosx/ConvertAndSave.h
index d27edf9..6488964 100644
--- a/modules/gui/macosx/ConvertAndSave.h
+++ b/modules/gui/macosx/ConvertAndSave.h
@@ -27,10 +27,9 @@
@class VLCDropDisabledImageView;
@class VLCDragDropView;
-@interface VLCConvertAndSave : NSObject
+@interface VLCConvertAndSave : NSWindowController
// main panel
-@property (weak) IBOutlet NSWindow *window;
@property (weak) IBOutlet VLCDragDropView *dropBox;
@property (weak) IBOutlet NSTextField *dropLabel;
@@ -141,10 +140,6 @@
@property (nonatomic) int audChannels;
-+ (VLCConvertAndSave *)sharedInstance;
-
-- (IBAction)toggleWindow;
-
- (IBAction)finalizePanel:(id)sender;
- (IBAction)openMedia:(id)sender;
- (IBAction)switchProfile:(id)sender;
diff --git a/modules/gui/macosx/ConvertAndSave.m
b/modules/gui/macosx/ConvertAndSave.m
index 7aa9131..60a72a8 100644
--- a/modules/gui/macosx/ConvertAndSave.m
+++ b/modules/gui/macosx/ConvertAndSave.m
@@ -118,21 +118,16 @@
[defaults registerDefaults:appDefaults];
}
-+ (VLCConvertAndSave *)sharedInstance
+- (id)init
{
-static VLCConvertAndSave *sharedInstance = nil;
-static dispatch_once_t pred;
+self = [super initWithWindowNibName:@ConvertAndSave];
-dispatch_once(pred, ^{
-sharedInstance = [VLCConvertAndSave new];
-});
-
-return sharedInstance;
+return self;
}
-- (void)awakeFromNib
+- (void)windowDidLoad
{
-[_window setTitle: _NS(Convert Stream)];
+[self.window setTitle: _NS(Convert Stream)];
[_okButton setTitle: _NS(Go!)];
[_dropLabel setStringValue: _NS(Drop media here)];
[_dropButton setTitle: _NS(Open media...)];
@@ -255,14 +250,6 @@
}
# pragma mark -
-# pragma mark Code to Communicate with other objects
-
-- (void)toggleWindow
-{
-[_window makeKeyAndOrderFront: nil];
-}
-
-# pragma mark -
# pragma mark User Interaction
- (IBAction)finalizePanel:(id)sender
@@ -271,7 +258,7 @@
if ([[[_streamTypePopup selectedItem] title] isEqualToString:@HTTP])
{
NSString *muxformat = [self.currentProfile firstObject];
if ([muxformat isEqualToString:@wav] || [muxformat
isEqualToString:@mov] || [muxformat isEqualToString:@mp4] || [muxformat
isEqualToString:@mkv]) {
-NSBeginInformationalAlertSheet(_NS(Invalid container format
for HTTP streaming), _NS(OK), @, @, _window,
+NSBeginInformationalAlertSheet(_NS(Invalid container format
for HTTP streaming), _NS(OK), @, @, self.window,
nil, nil, nil, nil,
_NS(Media encapsulated as %@
cannot be streamed through the HTTP protocol for technical reasons.),
[[self
currentEncapsulationFormatAsFileExtension:YES] uppercaseString]);
@@ -307,7 +294,7 @@
/* we're done with this input */
vlc_gc_decref(p_input);
-[_window performClose:sender];
+[self.window performClose:sender];
}
- (IBAction)openMedia:(id)sender
@@ -317,7 +304,7 @@
[openPanel setCanChooseDirectories:NO];
[openPanel setResolvesAliases:YES];
[openPanel setAllowsMultipleSelection:NO];
-[openPanel beginSheetModalForWindow:_window completionHandler:^(NSInteger
returnCode) {
+[openPanel beginSheetModalForWindow:self.window
completionHandler:^(NSInteger returnCode) {
if (returnCode == NSOKButton)
{
[self setMRL: toNSStr(vlc_path2uri([[[openPanel URL] path]
UTF8String], NULL))];
@@ -337,7 +324,7 @@
- (IBAction)customizeProfile:(id)sender
{
-[NSApp beginSheet:_customizePanel modalForWindow:_window
modalDelegate:self didEndSelector:NULL contextInfo:nil];
+[NSApp beginSheet:_customizePanel modalForWindow:self.window
modalDelegate:self didEndSelector:NULL contextInfo:nil];
}
- (IBAction)closeCustomizationSheet:(id)sender
@@ -373,7 +360,7 @@
[panel setPopupButtonContent:self.profileNames];
[panel setTarget:self];
-[panel runModalForWindow:_window];
+[panel runModalForWindow:self.window];
}
- (IBAction)iWantAFile:(id)sender
@@ -426,7 +413,7 @@
[saveFilePanel setCanCreateDirectories: YES];
if ([[_customizeEncapMatrix selectedCell] tag] != RAW
[vlc-commits] macosx: modernize CAS panel and code
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Wed Aug 5 15:47:26 2015 +0200| [dc7a28316e5fed98ead041bd5986d4fd656f44fe] | committer: David Fuhrmann macosx: modernize CAS panel and code http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dc7a28316e5fed98ead041bd5986d4fd656f44fe --- .../Resources/English.lproj/ConvertAndSave.xib | 1834 +++- modules/gui/macosx/ConvertAndSave.h| 197 ++- modules/gui/macosx/ConvertAndSave.m| 510 +++--- modules/gui/macosx/MainMenu.m |2 +- 4 files changed, 1356 insertions(+), 1187 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=dc7a28316e5fed98ead041bd5986d4fd656f44fe ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Convert VLCPrefs to NSWindowController subclass
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 2
12:44:31 2015 +0200| [c95d33f94d1ba0bbf75e0ab814d208dba27e90f6] | committer:
David Fuhrmann
macosx: Convert VLCPrefs to NSWindowController subclass
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c95d33f94d1ba0bbf75e0ab814d208dba27e90f6
---
.../macosx/Resources/English.lproj/Preferences.xib |6 ++---
modules/gui/macosx/intf.m |4 ---
modules/gui/macosx/prefs.h |3 +--
modules/gui/macosx/prefs.m | 28 +---
4 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.xib
b/extras/package/macosx/Resources/English.lproj/Preferences.xib
index c9db124..5f2643b 100644
--- a/extras/package/macosx/Resources/English.lproj/Preferences.xib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.xib
@@ -1,21 +1,21 @@
?xml version=1.0 encoding=UTF-8 standalone=no?
-document type=com.apple.InterfaceBuilder3.Cocoa.XIB version=3.0
toolsVersion=8152.3 systemVersion=15A216g targetRuntime=MacOSX.Cocoa
propertyAccessControl=none
+document type=com.apple.InterfaceBuilder3.Cocoa.XIB version=3.0
toolsVersion=7706 systemVersion=14F19a targetRuntime=MacOSX.Cocoa
propertyAccessControl=none
dependencies
deployment version=1070 identifier=macosx/
development version=5100 identifier=xcode/
-plugIn identifier=com.apple.InterfaceBuilder.CocoaPlugin
version=8152.3/
+plugIn identifier=com.apple.InterfaceBuilder.CocoaPlugin
version=7706/
/dependencies
objects
customObject id=-2 userLabel=File's Owner customClass=VLCPrefs
connections
outlet property=cancelButton destination=1543
id=xKX-e8-dhh/
outlet property=prefsView destination=1537
id=Yv9-bn-gFQ/
-outlet property=prefsWindow destination=1530
id=GrB-uU-B7B/
outlet property=resetButton destination=1542
id=2QZ-tp-Blv/
outlet property=saveButton destination=1541
id=Ng1-aE-PqI/
outlet property=showBasicButton destination=3642
id=E0I-T2-hF5/
outlet property=titleLabel destination=2257
id=Dzk-M9-HUc/
outlet property=tree destination=1534 id=ZfU-1d-7BL/
+outlet property=window destination=1530 id=tB4-5c-gLR/
/connections
/customObject
customObject id=-1 userLabel=First Responder
customClass=FirstResponder/
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 6c755ac..7ffc099 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -141,7 +141,6 @@ static int ShowController(vlc_object_t *p_this, const char
*psz_variable,
BOOL nib_main_loaded; /* main nibfile */
BOOL nib_about_loaded; /* about nibfile */
-BOOL nib_prefs_loaded; /* preferences xibfile */
BOOL nib_coredialogs_loaded; /* CoreDialogs nibfile */
BOOL b_active_videoplayback;
@@ -556,9 +555,6 @@ static int ShowController(vlc_object_t *p_this, const char
*psz_variable,
if (!_prefs)
_prefs = [[VLCPrefs alloc] init];
-if (!nib_prefs_loaded)
-nib_prefs_loaded = [NSBundle loadNibNamed:@Preferences owner:
_prefs];
-
return _prefs;
}
diff --git a/modules/gui/macosx/prefs.h b/modules/gui/macosx/prefs.h
index 6ee116e..2dcca55 100644
--- a/modules/gui/macosx/prefs.h
+++ b/modules/gui/macosx/prefs.h
@@ -27,9 +27,8 @@
/*
* VLCPrefs interface
*/
-@interface VLCPrefs : NSObject
+@interface VLCPrefs : NSWindowController
-@property (readwrite, weak) IBOutlet NSWindow *prefsWindow;
@property (readwrite, weak) IBOutlet NSTextField *titleLabel;
@property (readwrite, weak) IBOutlet NSOutlineView *tree;
@property (readwrite, weak) IBOutlet NSScrollView *prefsView;
diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index 851b667..0f6f8b1 100644
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -155,15 +155,23 @@
@implementation VLCPrefs
-- (void)awakeFromNib
+- (id)init
+{
+self = [super initWithWindowNibName:@Preferences];
+
+return self;
+}
+
+- (void)windowDidLoad
+
{
o_emptyView = [[NSView alloc] init];
_rootTreeItem = [[VLCTreeMainItem alloc] init];
-[_prefsWindow setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
-[_prefsWindow setHidesOnDeactivate:YES];
+[self.window setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
+[self.window setHidesOnDeactivate:YES];
-[_prefsWindow setTitle: _NS(Preferences)];
+[self.window setTitle: _NS(Preferences)];
[_saveButton setTitle: _NS(Save)];
[_cancelButton setTitle: _NS(Cancel
[vlc-commits] macosx: Convert VLCVideoEffects to NSWindowController subclass
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 2
13:22:53 2015 +0200| [7b66b72d7321bb68ab8056735ea1f2b78e9bd83f] | committer:
David Fuhrmann
macosx: Convert VLCVideoEffects to NSWindowController subclass
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7b66b72d7321bb68ab8056735ea1f2b78e9bd83f
---
modules/gui/macosx/MainMenu.m| 10 +-
modules/gui/macosx/VLCVoutWindowController.m |2 +-
modules/gui/macosx/VideoEffects.h|4 +--
modules/gui/macosx/VideoEffects.m| 44 ++
modules/gui/macosx/intf.h|2 ++
modules/gui/macosx/intf.m| 11 ++-
6 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index 1727e4b..d3f1893 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -53,13 +53,11 @@
@interface VLCMainMenu()
{
-BOOL b_nib_videoeffects_loaded;
BOOL b_nib_bookmarks_loaded;
BOOL b_nib_convertandsave_loaded;
AboutWindowController *_aboutWindowController;
HelpWindowController *_helpWindowController;
-VLCVideoEffects *_videoEffectsWindowController;
VLCConvertAndSave *_convertAndSaveWindowController;
AddonsWindowController *_addonsController;
@@ -1279,13 +1277,7 @@
- (IBAction)showVideoEffects:(id)sender
{
-if (_videoEffectsWindowController == nil)
-_videoEffectsWindowController = [[VLCVideoEffects alloc] init];
-
-if (!b_nib_videoeffects_loaded)
-b_nib_videoeffects_loaded = [NSBundle loadNibNamed:@VideoEffects
owner: _videoEffectsWindowController];
-
-[_videoEffectsWindowController toggleWindow:sender];
+[[[VLCMain sharedInstance] videoEffectsPanel] toggleWindow:sender];
}
- (IBAction)showTrackSynchronization:(id)sender
diff --git a/modules/gui/macosx/VLCVoutWindowController.m
b/modules/gui/macosx/VLCVoutWindowController.m
index 9564537..924d72f 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -589,7 +589,7 @@ void WindowClose(vout_window_t *p_wnd)
VLCMain *main = [VLCMain sharedInstance];
[[VLCMainWindow sharedInstance] setWindowLevel:i_level];
-[[VLCVideoEffects sharedInstance]
updateCocoaWindowLevel:currentStatusWindowLevel];
+[[main videoEffectsPanel] updateCocoaWindowLevel:currentStatusWindowLevel];
[[main audioEffectsPanel] updateCocoaWindowLevel:currentStatusWindowLevel];
[[VLCInfo sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
[[main bookmarks] updateCocoaWindowLevel:currentStatusWindowLevel];
diff --git a/modules/gui/macosx/VideoEffects.h
b/modules/gui/macosx/VideoEffects.h
index 24af41a..aab1272 100644
--- a/modules/gui/macosx/VideoEffects.h
+++ b/modules/gui/macosx/VideoEffects.h
@@ -23,10 +23,9 @@
#import Cocoa/Cocoa.h
-@interface VLCVideoEffects : NSObject
+@interface VLCVideoEffects : NSWindowController
/* generic */
-@property (readwrite, weak) IBOutlet NSWindow *window;
@property (readwrite, weak) IBOutlet NSTabView *tabView;
@property (readwrite, weak) IBOutlet NSPopUpButton *profilePopup;
@@ -162,7 +161,6 @@
@property (nonatomic) int posterizeValue;
/* generic */
-+ (VLCVideoEffects *)sharedInstance;
- (void)updateCocoaWindowLevel:(NSInteger)i_level;
- (void)saveCurrentProfile;
diff --git a/modules/gui/macosx/VideoEffects.m
b/modules/gui/macosx/VideoEffects.m
index 4d8d07c..76dd694 100644
--- a/modules/gui/macosx/VideoEffects.m
+++ b/modules/gui/macosx/VideoEffects.m
@@ -38,18 +38,6 @@
@implementation VLCVideoEffects
-+ (VLCVideoEffects *)sharedInstance
-{
-static VLCVideoEffects *sharedInstance = nil;
-static dispatch_once_t pred;
-
-dispatch_once(pred, ^{
-sharedInstance = [VLCVideoEffects new];
-});
-
-return sharedInstance;
-}
-
+ (void)initialize
{
NSDictionary *appDefaults = [NSDictionary
dictionaryWithObjectsAndKeys:[NSArray
arrayWithObject:@;;;0;1.00;1.00;1.00;1.00;0.05;16;2.00;OTA=;4;4;16711680;20;15;120;Z3JhZGllbnQ=;1;0;16711680;6;80;VkxD;-1;;-1;255;2;3;3],
@VideoEffectProfiles,
@@ -59,17 +47,19 @@
- (id)init
{
-self = [super init];
-i_old_profile_index = -1;
+self = [super initWithWindowNibName:@VideoEffects];
+if (self) {
+i_old_profile_index = -1;
+}
return self;
}
-- (void)awakeFromNib
+- (void)windowDidLoad
{
-[_window setTitle: _NS(Video Effects)];
-[_window setExcludedFromWindowsMenu:YES];
-[_window setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
+[self.window setTitle: _NS(Video Effects)];
+[self.window setExcludedFromWindowsMenu:YES];
+[self.window setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
[[_tabView tabViewItemAtIndex:[_tabView
indexOfTabViewItemWithIdentifier:@basic]] setLabel:_NS(Basic
[vlc-commits] macosx: Convert VLCSimplePrefs to NSWindowController subclass
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 2
12:21:25 2015 +0200| [e91c0ed1b70001824945069a2992b2a60019a895] | committer:
David Fuhrmann
macosx: Convert VLCSimplePrefs to NSWindowController subclass
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e91c0ed1b70001824945069a2992b2a60019a895
---
modules/gui/macosx/intf.m |4 ---
modules/gui/macosx/simple_prefs.h |3 +--
modules/gui/macosx/simple_prefs.m | 51 -
3 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index f8ece28..6c755ac 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -142,7 +142,6 @@ static int ShowController(vlc_object_t *p_this, const char
*psz_variable,
BOOL nib_main_loaded; /* main nibfile */
BOOL nib_about_loaded; /* about nibfile */
BOOL nib_prefs_loaded; /* preferences xibfile */
-BOOL nib_sprefs_loaded; /* simple preferences xibfile */
BOOL nib_coredialogs_loaded; /* CoreDialogs nibfile */
BOOL b_active_videoplayback;
@@ -549,9 +548,6 @@ static int ShowController(vlc_object_t *p_this, const char
*psz_variable,
if (!_sprefs)
_sprefs = [[VLCSimplePrefs alloc] init];
-if (!nib_sprefs_loaded)
-nib_sprefs_loaded = [NSBundle loadNibNamed:@SimplePreferences owner:
_sprefs];
-
return _sprefs;
}
diff --git a/modules/gui/macosx/simple_prefs.h
b/modules/gui/macosx/simple_prefs.h
index 90f21fa..3244f8f 100644
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -25,7 +25,7 @@
#import intf.h
#import vlc_common.h
-@interface VLCSimplePrefs : NSObject
+@interface VLCSimplePrefs : NSWindowController
@property (readwrite, weak) IBOutlet NSPopUpButton *audio_dolbyPopup;
@property (readwrite, weak) IBOutlet NSTextField *audio_dolbyLabel;
@@ -141,7 +141,6 @@
@property (readwrite, weak) IBOutlet NSBox *controlsBox;
@property (readwrite, weak) IBOutlet NSButton *resetButton;
@property (readwrite, weak) IBOutlet NSButton *saveButton;
-@property (readwrite, weak) IBOutlet NSWindow *window;
@property (readwrite, weak) IBOutlet NSButton *video_blackCheckbox;
@property (readwrite, weak) IBOutlet NSPopUpButton *video_devicePopup;
diff --git a/modules/gui/macosx/simple_prefs.m
b/modules/gui/macosx/simple_prefs.m
index b0f2913..41a42e2 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -207,12 +207,15 @@ static NSString* VLCHotkeysSettingToolbarIdentifier =
@Hotkeys Settings Item Id
- (id)init
{
-self = [super init];
-p_intf = VLCIntf;
+self = [super initWithWindowNibName:@SimplePreferences];
+if (self) {
+p_intf = VLCIntf;
+}
+
return self;
}
-- (void)awakeFromNib
+- (void)windowDidLoad
{
[self initStrings];
@@ -233,10 +236,10 @@ static NSString* VLCHotkeysSettingToolbarIdentifier =
@Hotkeys Settings Item Id
[toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel];
[toolbar setSizeMode: NSToolbarSizeModeRegular];
[toolbar setDelegate: self];
-[_window setToolbar:toolbar];
+[self.window setToolbar:toolbar];
-[_window setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
-[_window setHidesOnDeactivate:YES];
+[self.window setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
+[self.window setHidesOnDeactivate:YES];
[_hotkeys_listbox setTarget:self];
[_hotkeys_listbox setDoubleAction:@selector(hotkeyTableDoubleClick:)];
@@ -422,7 +425,7 @@ create_toolbar_item(NSString *itemIdent, NSString *name,
NSString *desc, NSStrin
[_cancelButton setTitle: _NS(Cancel)];
[_resetButton setTitle: _NS(Reset All)];
[_saveButton setTitle: _NS(Save)];
-[_window setTitle: _NS(Preferences)];
+[self.window setTitle: _NS(Preferences)];
}
/* TODO: move this part to core */
@@ -802,20 +805,20 @@ static inline char * __config_GetLabel(vlc_object_t
*p_this, const char *psz_nam
- (void)showSimplePrefs
{
/* we want to show the interface settings, if no category was chosen */
-if ([[_window toolbar] selectedItemIdentifier] == nil) {
-[[_window toolbar] setSelectedItemIdentifier:
VLCIntfSettingToolbarIdentifier];
+if ([[self.window toolbar] selectedItemIdentifier] == nil) {
+[[self.window toolbar] setSelectedItemIdentifier:
VLCIntfSettingToolbarIdentifier];
[self showInterfaceSettings];
}
[self resetControls];
-[_window center];
-[_window makeKeyAndOrderFront: self];
+[self.window center];
+[self.window makeKeyAndOrderFront: self];
}
- (void)showSimplePrefsWithLevel:(NSInteger)i_window_level
{
-[_window setLevel: i_window_level];
+[self.window setLevel: i_window_level];
[self showSimplePrefs];
}
@@ -823,14 +826,14 @@ static inline char * __config_GetLabel(vlc_object_t
*p_this, const
[vlc-commits] macosx: Convert VLCTrackSync to NSWindowController subclass, remove singleton
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 2
13:00:14 2015 +0200| [548807de5ad78c2d5fc2a7ce4c6aac24e6526c65] | committer:
David Fuhrmann
macosx: Convert VLCTrackSync to NSWindowController subclass, remove singleton
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=548807de5ad78c2d5fc2a7ce4c6aac24e6526c65
---
modules/gui/macosx/InputManager.m|2 +-
modules/gui/macosx/MainMenu.m| 10 +
modules/gui/macosx/TrackSynchronization.h|4 +---
modules/gui/macosx/TrackSynchronization.m| 31 --
modules/gui/macosx/VLCVoutWindowController.m |2 +-
modules/gui/macosx/intf.h|3 +++
modules/gui/macosx/intf.m|9
7 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/modules/gui/macosx/InputManager.m
b/modules/gui/macosx/InputManager.m
index a480fe1..e435a58 100644
--- a/modules/gui/macosx/InputManager.m
+++ b/modules/gui/macosx/InputManager.m
@@ -419,7 +419,7 @@ static int InputEvent(vlc_object_t *p_this, const char
*psz_var,
- (void)updateDelays
{
-[[VLCTrackSynchronization sharedInstance] updateValues];
+[[[VLCMain sharedInstance] trackSyncPanel] updateValues];
}
- (void)updateMainMenu
diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index 86d9641..d1fa3bc 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -55,7 +55,6 @@
{
BOOL b_nib_videoeffects_loaded;
BOOL b_nib_audioeffects_loaded;
-BOOL b_nib_tracksynchrloaded;
BOOL b_nib_bookmarks_loaded;
BOOL b_nib_convertandsave_loaded;
@@ -63,7 +62,6 @@
HelpWindowController *_helpWindowController;
VLCVideoEffects *_videoEffectsWindowController;
VLCAudioEffects *_audioEffectsWindowController;
-VLCTrackSynchronization *_trackSynchronizationWindowController;
VLCConvertAndSave *_convertAndSaveWindowController;
AddonsWindowController *_addonsController;
@@ -1294,13 +1292,7 @@
- (IBAction)showTrackSynchronization:(id)sender
{
-if (!_trackSynchronizationWindowController)
-_trackSynchronizationWindowController = [[VLCTrackSynchronization
alloc] init];
-
-if (!b_nib_tracksynchrloaded)
-b_nib_tracksynchrloaded = [NSBundle loadNibNamed:@SyncTracks
owner:_trackSynchronizationWindowController];
-
-[_trackSynchronizationWindowController toggleWindow:sender];
+[[[VLCMain sharedInstance] trackSyncPanel] toggleWindow:sender];
}
- (IBAction)showAudioEffects:(id)sender
diff --git a/modules/gui/macosx/TrackSynchronization.h
b/modules/gui/macosx/TrackSynchronization.h
index a6d0bbf..4cb32e4 100644
--- a/modules/gui/macosx/TrackSynchronization.h
+++ b/modules/gui/macosx/TrackSynchronization.h
@@ -24,10 +24,9 @@
#import Cocoa/Cocoa.h
-@interface VLCTrackSynchronization : NSObject
+@interface VLCTrackSynchronization : NSWindowController
/* generic */
-@property (readwrite, weak) IBOutlet NSWindow *window;
@property (readwrite, weak) IBOutlet NSButton *resetButton;
/* Audio / Video */
@@ -48,7 +47,6 @@
@property (readwrite, weak) IBOutlet NSTextField *sv_durTextField;
@property (readwrite, weak) IBOutlet NSStepper *sv_durStepper;
-+ (VLCTrackSynchronization *)sharedInstance;
- (void)updateCocoaWindowLevel:(NSInteger)i_level;
- (IBAction)toggleWindow:(id)sender;
diff --git a/modules/gui/macosx/TrackSynchronization.m
b/modules/gui/macosx/TrackSynchronization.m
index 4343cd4..3780195 100644
--- a/modules/gui/macosx/TrackSynchronization.m
+++ b/modules/gui/macosx/TrackSynchronization.m
@@ -36,21 +36,16 @@
@implementation VLCTrackSynchronization
-+ (VLCTrackSynchronization *)sharedInstance
+- (id)init
{
-static VLCTrackSynchronization *sharedInstance = nil;
-static dispatch_once_t pred;
+self = [super initWithWindowNibName:@SyncTracks];
-dispatch_once(pred, ^{
-sharedInstance = [VLCTrackSynchronization new];
-});
-
-return sharedInstance;
+return self;
}
-- (void)awakeFromNib
+- (void)windowDidLoad
{
-[_window setTitle:_NS(Track Synchronization)];
+[self.window setTitle:_NS(Track Synchronization)];
[_resetButton setTitle:_NS(Reset)];
[_avLabel setStringValue:_NS(Audio/Video)];
[_av_advanceLabel setStringValue: _NS(Audio track synchronization:)];
@@ -86,24 +81,26 @@
[[_sv_durTextField formatter] setFormat:[NSString
stringWithFormat:@#,##0.000%@, o_suffix]];
[_sv_durTextField setToolTip: o_toolTip];
-[_window setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
+[self.window setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
[self resetValues:self];
}
- (void)updateCocoaWindowLevel:(NSInteger)i_level
{
-if (_window [_window isVisible] [_window level] != i_level)
-[_window setLevel: i_level];
+if (self.window [self.window isVisible] [self.window level] !=
i_level
[vlc-commits] macosx: Fix crash in eyetv controller, reformat
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 2
12:12:44 2015 +0200| [a493185e16a210741a1d9f16910e626a5bff7e3d] | committer:
David Fuhrmann
macosx: Fix crash in eyetv controller, reformat
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a493185e16a210741a1d9f16910e626a5bff7e3d
---
modules/gui/macosx/eyetv.m | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/modules/gui/macosx/eyetv.m b/modules/gui/macosx/eyetv.m
index 1b7f463..4455335 100644
--- a/modules/gui/macosx/eyetv.m
+++ b/modules/gui/macosx/eyetv.m
@@ -34,16 +34,20 @@
{
self = [super init];
if (self) {
-[[NSDistributedNotificationCenter defaultCenter]
- addObserver:self
- selector:@selector(globalNotificationReceived:)
- name:NULL
- object:@VLCEyeTVSupport
-
suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
+[[NSDistributedNotificationCenter defaultCenter] addObserver:self
+
selector:@selector(globalNotificationReceived:)
+name:NULL
+
object:@VLCEyeTVSupport
+
suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
}
return self;
}
+- (void)dealloc
+{
+[[NSDistributedNotificationCenter defaultCenter] removeObserver:self];
+}
+
- (void)globalNotificationReceived: (NSNotification *)theNotification
{
/* update our info on the used device */
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Convert VLCBookmarks to NSWindowController subclass
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 2 11:21:02 2015 +0200| [3a07082aca9ae99a80c89b1c2b2fbb4f2df81315] | committer: David Fuhrmann macosx: Convert VLCBookmarks to NSWindowController subclass http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3a07082aca9ae99a80c89b1c2b2fbb4f2df81315 --- .../macosx/Resources/English.lproj/Bookmarks.xib | 123 +--- modules/gui/macosx/bookmarks.h |3 +- modules/gui/macosx/bookmarks.m | 49 modules/gui/macosx/intf.m |4 - 4 files changed, 133 insertions(+), 46 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=3a07082aca9ae99a80c89b1c2b2fbb4f2df81315 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Convert VLCOpen to NSWindowController subclass
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 2
12:12:06 2015 +0200| [2d47c8c002ee9ae1343b9feb7831d789337db642] | committer:
David Fuhrmann
macosx: Convert VLCOpen to NSWindowController subclass
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2d47c8c002ee9ae1343b9feb7831d789337db642
---
.../macosx/Resources/English.lproj/Open.xib|6 +--
modules/gui/macosx/intf.m |6 +--
modules/gui/macosx/open.h |4 +-
modules/gui/macosx/open.m | 39 +---
4 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/extras/package/macosx/Resources/English.lproj/Open.xib
b/extras/package/macosx/Resources/English.lproj/Open.xib
index 3aa853d..69ebb88 100644
--- a/extras/package/macosx/Resources/English.lproj/Open.xib
+++ b/extras/package/macosx/Resources/English.lproj/Open.xib
@@ -1,9 +1,9 @@
?xml version=1.0 encoding=UTF-8 standalone=no?
-document type=com.apple.InterfaceBuilder3.Cocoa.XIB version=3.0
toolsVersion=8152.3 systemVersion=14F6a targetRuntime=MacOSX.Cocoa
propertyAccessControl=none
+document type=com.apple.InterfaceBuilder3.Cocoa.XIB version=3.0
toolsVersion=7706 systemVersion=14F19a targetRuntime=MacOSX.Cocoa
propertyAccessControl=none
dependencies
deployment version=1070 identifier=macosx/
development version=5100 identifier=xcode/
-plugIn identifier=com.apple.InterfaceBuilder.CocoaPlugin
version=8152.3/
+plugIn identifier=com.apple.InterfaceBuilder.CocoaPlugin
version=7706/
/dependencies
objects
customObject id=-2 userLabel=File's Owner customClass=VLCOpen
@@ -126,7 +126,6 @@
outlet property=okButton destination=640 id=S9F-WP-A7y/
outlet property=outputCheckbox destination=929
id=Gz1-rY-w0Q/
outlet property=outputSettingsButton destination=1256
id=ruY-7h-HIS/
-outlet property=panel destination=636 id=POG-Xe-8j5/
outlet property=qtkAudioCheckbox destination=3492
id=5d3-k7-1dB/
outlet property=qtkAudioDevicePopup destination=3438
id=Jt3-3n-AjR/
outlet property=qtkHeightLabel destination=3349
id=1V9-Wm-BdJ/
@@ -160,6 +159,7 @@
outlet property=screenqtkAudioCheckbox destination=3515
id=Y4X-ro-aSB/
outlet property=screenqtkAudioPopup destination=3506
id=gkb-yW-rOf/
outlet property=tabView destination=678 id=bM9-Bh-adI/
+outlet property=window destination=636 id=cOB-1N-Yl8/
/connections
/customObject
customObject id=-1 userLabel=First Responder
customClass=FirstResponder/
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index df5ef4d..f8ece28 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -140,7 +140,6 @@ static int ShowController(vlc_object_t *p_this, const char
*psz_variable,
int items_at_launch;
BOOL nib_main_loaded; /* main nibfile */
-BOOL nib_open_loaded; /* open nibfile */
BOOL nib_about_loaded; /* about nibfile */
BOOL nib_prefs_loaded; /* preferences xibfile */
BOOL nib_sprefs_loaded; /* simple preferences xibfile */
@@ -223,7 +222,6 @@ static int ShowController(vlc_object_t *p_this, const char
*psz_variable,
- (void)applicationWillFinishLaunching:(NSNotification *)aNotification
{
-_open = [[VLCOpen alloc] init];
_coreinteraction = [VLCCoreInteraction sharedInstance];
playlist_t * p_playlist = pl_Get(VLCIntf);
@@ -540,8 +538,8 @@ static int ShowController(vlc_object_t *p_this, const char
*psz_variable,
- (VLCOpen *)open
{
-if (!nib_open_loaded)
-nib_open_loaded = [NSBundle loadNibNamed:@Open owner: _open];
+if (!_open)
+_open = [[VLCOpen alloc] init];
return _open;
}
diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h
index beabc02..1f6bd8d 100644
--- a/modules/gui/macosx/open.h
+++ b/modules/gui/macosx/open.h
@@ -24,9 +24,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301,
USA.
*/
-@interface VLCOpen : NSObject
-
-@property (readwrite, weak) IBOutlet NSWindow *panel;
+@interface VLCOpen : NSWindowController
@property (readwrite, weak) IBOutlet NSTextField *mrlTextField;
@property (readwrite, weak) IBOutlet NSTextField *mrlLabel;
diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index cc26c19..d84f47d 100644
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -84,6 +84,14 @@ struct display_info_t
#pragma mark -
#pragma mark Init
+- (id)init
+{
+self = [super initWithWindowNibName:@Open];
+
+return self;
+}
+
+
- (void)dealloc
{
for (int i = 0; i [_displayInfos count]; i ++) {
@@ -92,13 +100,13 @@ struct display_info_t
[vlc-commits] macosx: Convert VLCAudioEffects to NSWindowController subclass
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Aug 2
13:14:18 2015 +0200| [f6c4ab1458565a958ad8bb5ecbe9fc117f2c3ce9] | committer:
David Fuhrmann
macosx: Convert VLCAudioEffects to NSWindowController subclass
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f6c4ab1458565a958ad8bb5ecbe9fc117f2c3ce9
---
modules/gui/macosx/AudioEffects.h|5 +--
modules/gui/macosx/AudioEffects.m| 50 +++---
modules/gui/macosx/MainMenu.m| 10 +-
modules/gui/macosx/VLCVoutWindowController.m |2 +-
modules/gui/macosx/intf.h|2 ++
modules/gui/macosx/intf.m| 11 +-
6 files changed, 36 insertions(+), 44 deletions(-)
diff --git a/modules/gui/macosx/AudioEffects.h
b/modules/gui/macosx/AudioEffects.h
index 60ec1a9..033f24f 100644
--- a/modules/gui/macosx/AudioEffects.h
+++ b/modules/gui/macosx/AudioEffects.h
@@ -24,10 +24,9 @@
#import Cocoa/Cocoa.h
-@interface VLCAudioEffects : NSObject
+@interface VLCAudioEffects : NSWindowController
/* generic */
-@property (readwrite, weak) IBOutlet NSWindow *window;
@property (readwrite, weak) IBOutlet NSTabView *tabView;
@property (readwrite, weak) IBOutlet NSPopUpButton *profilePopup;
@@ -103,8 +102,6 @@
@property (readwrite, weak) IBOutlet NSButton *filterKaraokeCheckbox;
/* generic */
-+ (VLCAudioEffects *)sharedInstance;
-
- (IBAction)profileSelectorAction:(id)sender;
- (void)toggleWindow:(id)sender;
diff --git a/modules/gui/macosx/AudioEffects.m
b/modules/gui/macosx/AudioEffects.m
index 7e0c57b..2ee5655 100644
--- a/modules/gui/macosx/AudioEffects.m
+++ b/modules/gui/macosx/AudioEffects.m
@@ -51,19 +51,8 @@
@implementation VLCAudioEffects
-+ (VLCAudioEffects *)sharedInstance
++ (void)initialize
{
-static VLCAudioEffects *sharedInstance = nil;
-static dispatch_once_t pred;
-
-dispatch_once(pred, ^{
-sharedInstance = [VLCAudioEffects new];
-});
-
-return sharedInstance;
-}
-
-+ (void)initialize{
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSString *workString;
@@ -99,12 +88,15 @@
- (id)init
{
-self = [super init];
-i_old_profile_index = -1;
+self = [super initWithWindowNibName:@AudioEffects];
+if (self) {
+i_old_profile_index = -1;
+}
+
return self;
}
-- (void)awakeFromNib
+- (void)windowDidLoad
{
/* setup the user's language */
/* Equalizer */
@@ -144,9 +136,9 @@
[[_tabView tabViewItemAtIndex:[_tabView
indexOfTabViewItemWithIdentifier:@compressor]] setLabel:_NS(Compressor)];
[[_tabView tabViewItemAtIndex:[_tabView
indexOfTabViewItemWithIdentifier:@spatializer]] setLabel:_NS(Spatializer)];
[[_tabView tabViewItemAtIndex:[_tabView
indexOfTabViewItemWithIdentifier:@filter]] setLabel:_NS(Filter)];
-[_window setTitle:_NS(Audio Effects)];
-[_window setExcludedFromWindowsMenu:YES];
-[_window setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
+[self.window setTitle:_NS(Audio Effects)];
+[self.window setExcludedFromWindowsMenu:YES];
+[self.window setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
[self equalizerUpdated];
[self resetCompressor];
@@ -200,17 +192,17 @@
#pragma mark generic code
- (void)updateCocoaWindowLevel:(NSInteger)i_level
{
-if (_window [_window isVisible] [_window level] != i_level)
-[_window setLevel: i_level];
+if (self.window [self.window isVisible] [self.window level] !=
i_level)
+[self.window setLevel: i_level];
}
- (IBAction)toggleWindow:(id)sender
{
-if ([_window isKeyWindow])
-[_window orderOut:sender];
+if ([self.window isKeyWindow])
+[self.window orderOut:sender];
else {
-[_window setLevel: [[[VLCMain sharedInstance] voutController]
currentStatusWindowLevel]];
-[_window makeKeyAndOrderFront:sender];
+[self.window setLevel: [[[VLCMain sharedInstance] voutController]
currentStatusWindowLevel]];
+[self.window makeKeyAndOrderFront:sender];
}
}
@@ -375,7 +367,7 @@
[panel setTarget:self];
b_genericAudioProfileInInteraction = YES;
-[panel runModalForWindow:_window];
+[panel runModalForWindow:self.window];
}
- (void)removeAudioEffectsProfile:(id)sender
@@ -390,7 +382,7 @@
[panel setTarget:self];
b_genericAudioProfileInInteraction = YES;
-[panel runModalForWindow:_window];
+[panel runModalForWindow:self.window];
}
#pragma mark -
@@ -616,7 +608,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
[panel setTarget:self];
b_genericAudioProfileInInteraction = NO;
-[panel runModalForWindow:_window];
+[panel runModalForWindow:self.window];
}
- (void)panel:(VLCEnterTextPanel *)panel returnValue:(NSUInteger)value
text:(NSString *)text
@@ -672,7 +664,7 @@ static bool GetEqualizerStatus(intf_thread_t
[vlc-commits] macosx: rebuild plugins cache for bundle creation
vlc/vlc-2.2 | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun
Jul 26 22:47:38 2015 +0200| [9e12195d3e4316278af1fa4bcb6a705ff27456fd] |
committer: David Fuhrmann
macosx: rebuild plugins cache for bundle creation
The build-dir plugin cache is incomplete and contains wrong paths.
(cherry picked from commit 5d6b149ffbe60541e3be9e14417dde21f315868a)
Signed-off-by: David Fuhrmann dfuhrm...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=9e12195d3e4316278af1fa4bcb6a705ff27456fd
---
extras/package/macosx/package.mak |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 80d4b49..c312e35 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -21,7 +21,7 @@ VLC.app: VLC-tmp
rm -Rf
$@/Contents/Frameworks/BGHUDAppKit.framework/Versions/A/Resources/BGHUDAppKitPlugin.ibplugin
rm -Rf
$@/Contents/Frameworks/BGHUDAppKit.framework/Versions/A/Resources/README.textile
PRODUCT=$@ ACTION=release-makefile src_dir=$(srcdir)
build_dir=$(top_builddir) sh $(srcdir)/extras/package/macosx/build-package.sh
- cp $(top_builddir)/modules/plugins.dat $@/Contents/MacOS/plugins
+ bin/vlc-cache-gen $@/Contents/MacOS/plugins
find $@ -type d -exec chmod ugo+rx '{}' \;
find $@ -type f -exec chmod ugo+r '{}' \;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: do not create VLCVoutController twice, remove singleton
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Thu Jul 30
18:58:00 2015 +0200| [cb8e4a6ddb651b33ba1923b5cfa9ac1500c60d93] | committer:
David Fuhrmann
macosx: do not create VLCVoutController twice, remove singleton
The only valid instance of the vout controller is owned by VLCMain.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cb8e4a6ddb651b33ba1923b5cfa9ac1500c60d93
---
modules/gui/macosx/VLCVoutWindowController.h |2 --
modules/gui/macosx/VLCVoutWindowController.m | 12
modules/gui/macosx/intf.m|2 --
3 files changed, 16 deletions(-)
diff --git a/modules/gui/macosx/VLCVoutWindowController.h
b/modules/gui/macosx/VLCVoutWindowController.h
index 2381fb8..fbc81a5 100644
--- a/modules/gui/macosx/VLCVoutWindowController.h
+++ b/modules/gui/macosx/VLCVoutWindowController.h
@@ -32,8 +32,6 @@
@interface VLCVoutWindowController : NSObject
-+ (VLCVoutWindowController *)sharedInstance;
-
@property (readonly, atomic) NSLock *lock;
@property (readonly, nonatomic) NSInteger currentStatusWindowLevel;
diff --git a/modules/gui/macosx/VLCVoutWindowController.m
b/modules/gui/macosx/VLCVoutWindowController.m
index f000486..a588abf 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -211,18 +211,6 @@ void WindowClose(vout_window_t *p_wnd)
@implementation VLCVoutWindowController
-+ (VLCVoutWindowController *)sharedInstance
-{
-static VLCVoutWindowController *sharedInstance = nil;
-static dispatch_once_t pred;
-
-dispatch_once(pred, ^{
-sharedInstance = [VLCVoutWindowController new];
-});
-
-return sharedInstance;
-}
-
- (id)init
{
self = [super init];
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 1cb6ad1..9860e67 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -86,8 +86,6 @@ int OpenIntf (vlc_object_t *p_this)
[NSBundle loadNibNamed:@MainWindow owner:[VLCMain sharedInstance]];
[[[VLCMain sharedInstance] mainWindow] makeKeyAndOrderFront:nil];
-[VLCVoutWindowController sharedInstance];
-
return VLC_SUCCESS;
}
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: refix bugs by initializing MainWindow in OpenIntf
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Thu Jul 30
18:49:53 2015 +0200| [329b882090e0a522b59adb86c49bdf76959d7977] | committer:
David Fuhrmann
macosx: refix bugs by initializing MainWindow in OpenIntf
Fixes regressions introduced in f450457875207163ddb4f435e0bb5dc868e35ee8.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=329b882090e0a522b59adb86c49bdf76959d7977
---
modules/gui/macosx/intf.m |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 4edf1f2..1cb6ad1 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -83,6 +83,8 @@ int OpenIntf (vlc_object_t *p_this)
[[VLCMain sharedInstance] setIntf: p_intf];
[NSBundle loadNibNamed:@MainMenu owner:[[VLCMain sharedInstance]
mainMenu]];
+[NSBundle loadNibNamed:@MainWindow owner:[VLCMain sharedInstance]];
+[[[VLCMain sharedInstance] mainWindow] makeKeyAndOrderFront:nil];
[VLCVoutWindowController sharedInstance];
@@ -204,6 +206,7 @@ static int ShowController(vlc_object_t *p_this, const char
*psz_variable,
_mainmenu = [[VLCMainMenu alloc] init];
_voutController = [[VLCVoutWindowController alloc] init];
+_playlist = [[VLCPlaylist alloc] init];
}
return self;
@@ -221,9 +224,6 @@ static int ShowController(vlc_object_t *p_this, const char
*psz_variable,
- (void)applicationWillFinishLaunching:(NSNotification *)aNotification
{
-_playlist = [[VLCPlaylist alloc] init];
-[NSBundle loadNibNamed:@MainWindow owner:self];
-[[self mainWindow] makeKeyAndOrderFront:nil];
_open = [[VLCOpen alloc] init];
_coreinteraction = [VLCCoreInteraction sharedInstance];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: convert debug message visualizer to NSWindowController
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Thu Jul 30 19:18:12 2015 +0200| [e34a1cb114aac43b36b797e5593c4f3ee631ed27] | committer: David Fuhrmann macosx: convert debug message visualizer to NSWindowController ... and get rid of another singleton. http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e34a1cb114aac43b36b797e5593c4f3ee631ed27 --- .../English.lproj/DebugMessageVisualizer.xib | 42 +--- modules/gui/macosx/DebugMessageVisualizer.h|5 +-- modules/gui/macosx/DebugMessageVisualizer.m| 25 ++-- modules/gui/macosx/MainMenu.m |2 +- modules/gui/macosx/intf.h |3 ++ modules/gui/macosx/intf.m | 10 + 6 files changed, 57 insertions(+), 30 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=e34a1cb114aac43b36b797e5593c4f3ee631ed27 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: simplify creation of latency popup menu
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Jul 26 22:18:04 2015 +0200| [83d5c9754878b38d51b8b2d243d88a3539ad3525] | committer: David Fuhrmann macosx: simplify creation of latency popup menu http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=83d5c9754878b38d51b8b2d243d88a3539ad3525 --- modules/gui/macosx/simple_prefs.m | 35 --- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index 4bb36bb..b0f2913 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -704,30 +704,19 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam [self setupButton:_input_mkv_preload_dirCheckbox forBoolValue: mkv-preload-local-dir]; -/* do not trust translators to do the correct thing, - * so re-build the menu in an unorthodox way (#15106) */ [_input_cachelevelPopup removeAllItems]; -NSArray *plainTitles = @[@Custom, @Lowest latency, @Low latency, @Normal, @High latency, @Higher latency]; -NSMenuItem *workerItem; -[_input_cachelevelPopup addItemsWithTitles: plainTitles]; -workerItem = [_input_cachelevelPopup itemAtIndex: 0]; -[workerItem setTag: 0]; -[workerItem setTitle:_NS(Custom)]; -workerItem = [_input_cachelevelPopup itemAtIndex: 1]; -[workerItem setTag: 100]; -[workerItem setTitle:_NS(Lowest Latency)]; -workerItem = [_input_cachelevelPopup itemAtIndex: 2]; -[workerItem setTag: 200]; -[workerItem setTitle:_NS(Low Latency)]; -workerItem = [_input_cachelevelPopup itemAtIndex: 3]; -[workerItem setTag: 300]; -[workerItem setTitle:_NS(Normal)]; -workerItem = [_input_cachelevelPopup itemAtIndex: 4]; -[workerItem setTag: 500]; -[workerItem setTitle:_NS(Higher Latency)]; -workerItem = [_input_cachelevelPopup itemAtIndex: 5]; -[workerItem setTag: 1000]; -[workerItem setTitle:_NS(Highest Latency)]; +NSMenuItem *item = [[_input_cachelevelPopup menu] addItemWithTitle:_NS(Custom) action:nil keyEquivalent:@]; +[item setTag: 0]; +item = [[_input_cachelevelPopup menu] addItemWithTitle:_NS(Lowest Latency) action:nil keyEquivalent:@]; +[item setTag: 100]; +item = [[_input_cachelevelPopup menu] addItemWithTitle:_NS(Low Latency) action:nil keyEquivalent:@]; +[item setTag: 200]; +item = [[_input_cachelevelPopup menu] addItemWithTitle:_NS(Normal) action:nil keyEquivalent:@]; +[item setTag: 300]; +item = [[_input_cachelevelPopup menu] addItemWithTitle:_NS(Higher Latency) action:nil keyEquivalent:@]; +[item setTag: 500]; +item = [[_input_cachelevelPopup menu] addItemWithTitle:_NS(Highest Latency) action:nil keyEquivalent:@]; +[item setTag: 1000]; #define TestCaC(name, factor) \ cache_equal = cache_equal \ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: rebuild plugins cache for bundle creation
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Jul 26
22:47:38 2015 +0200| [5d6b149ffbe60541e3be9e14417dde21f315868a] | committer:
David Fuhrmann
macosx: rebuild plugins cache for bundle creation
The build-dir plugin cache is incomplete and contains wrong paths.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5d6b149ffbe60541e3be9e14417dde21f315868a
---
extras/package/macosx/package.mak |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 14cdf33..a623c6b 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -21,7 +21,7 @@ VLC.app: VLC-tmp
rm -Rf
$@/Contents/Frameworks/BGHUDAppKit.framework/Versions/A/Resources/BGHUDAppKitPlugin.ibplugin
rm -Rf
$@/Contents/Frameworks/BGHUDAppKit.framework/Versions/A/Resources/README.textile
PRODUCT=$@ ACTION=release-makefile src_dir=$(srcdir)
build_dir=$(top_builddir) sh $(srcdir)/extras/package/macosx/build-package.sh
- cp $(top_builddir)/modules/plugins.dat $@/Contents/MacOS/plugins
+ bin/vlc-cache-gen $@/Contents/MacOS/plugins
find $@ -type d -exec chmod ugo+rx '{}' \;
find $@ -type f -exec chmod ugo+r '{}' \;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: PLItems parent should be weak to avoid retain cycles
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Wed Jul 15 19:24:41 2015 +0200| [1ca35e8e31f1707b8eb3afde6e955c86d11bc499] | committer: David Fuhrmann macosx: PLItems parent should be weak to avoid retain cycles http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1ca35e8e31f1707b8eb3afde6e955c86d11bc499 --- modules/gui/macosx/PLItem.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gui/macosx/PLItem.h b/modules/gui/macosx/PLItem.h index 7f05459..3491599 100644 --- a/modules/gui/macosx/PLItem.h +++ b/modules/gui/macosx/PLItem.h @@ -28,7 +28,7 @@ @property(readonly, copy) NSMutableArray *children; @property(readonly) int plItemId; @property(readonly) input_item_t *input; -@property(readwrite, retain) PLItem *parent; +@property(readwrite, weak) PLItem *parent; - (id)initWithPlaylistItem:(playlist_item_t *)p_item; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: simple prefs: fix native fullscreen checkbox
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Wed Jul 15 21:13:03 2015 +0200| [38cb6fd9c07ef1e9eba6d1297c7a86291d78eb70] | committer: David Fuhrmann macosx: simple prefs: fix native fullscreen checkbox http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=38cb6fd9c07ef1e9eba6d1297c7a86291d78eb70 --- modules/gui/macosx/simple_prefs.m |3 --- 1 file changed, 3 deletions(-) diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index b007a05..68d20b4 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -582,9 +582,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam [self setupButton: o_intf_nativefullscreen_ckb forBoolValue: macosx-nativefullscreenmode]; -[o_intf_nativefullscreen_ckb setState: NSOffState]; -[o_intf_nativefullscreen_ckb setEnabled: NO]; - [self setupButton: o_intf_embedded_ckb forBoolValue: embedded-video]; [self setupButton: o_intf_appleremote_ckb forBoolValue: macosx-appleremote]; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: remove stray code
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jul 11
15:25:26 2015 +0200| [52a35891a4ef1f95e0c677af47837270536a] | committer:
David Fuhrmann
macosx: remove stray code
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=52a35891a4ef1f95e0c677af47837270536a
---
modules/gui/macosx/playlist.h |2 --
modules/gui/macosx/playlist.m | 16
2 files changed, 18 deletions(-)
diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index a89c317..f22e4e7 100644
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -75,8 +75,6 @@
IBOutlet id o_playlist_header;
-int currentResumeTimeout;
-
PLModel *o_model;
}
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 3f3afa7..0bbcb9c 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -946,22 +946,6 @@
return YES;
}
-- (void)updateAlertWindow:(NSTimer *)timer
-{
-NSAlert *alert = [timer userInfo];
-
---currentResumeTimeout;
-if (currentResumeTimeout = 0) {
-[[alert window] close];
-[NSApp abortModal];
-}
-
-NSString *buttonLabel = _NS(Restart playback);
-buttonLabel = [buttonLabel stringByAppendingFormat:@ (%d),
currentResumeTimeout];
-
-[[[alert buttons] objectAtIndex:2] setTitle:buttonLabel];
-}
-
- (void)continuePlaybackWhereYouLeftOff:(input_thread_t *)p_input_thread
{
NSDictionary *recentlyPlayedFiles = [[NSUserDefaults standardUserDefaults]
objectForKey:@recentlyPlayedMedia];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: resume dialog: make more space for l10n
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Jul 12
19:16:57 2015 +0200| [a2aa300a401f1df6d88cb168d8bee7184c2206c6] | committer:
David Fuhrmann
macosx: resume dialog: make more space for l10n
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a2aa300a401f1df6d88cb168d8bee7184c2206c6
---
.../Resources/English.lproj/ResumeDialog.xib | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
b/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
index 9ad09c2..7b180cd 100644
--- a/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
+++ b/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
@@ -41,7 +41,7 @@
object class=NSWindowTemplate id=1005
int key=NSWindowStyleMask1/int
int key=NSWindowBacking2/int
- string key=NSWindowRect{{196, 240}, {650,
145}}/string
+ string key=NSWindowRect{{196, 240}, {684,
133}}/string
int key=NSWTFlags-529006592/int
string key=NSWindowTitle/
string key=NSWindowClassNSWindow/string
@@ -54,7 +54,7 @@
object class=NSTextField
id=646754310
reference
key=NSNextResponder ref=1006/
int
key=NSvFlags268/int
- string
key=NSFrame{{102, 56}, {530, 44}}/string
+ string
key=NSFrame{{102, 49}, {564, 39}}/string
reference
key=NSSuperview ref=1006/
reference
key=NSWindow/
reference
key=NSNextKeyView ref=894576230/
@@ -63,11 +63,11 @@
object
class=NSTextFieldCell key=NSCell id=903659412
int
key=NSCellFlags67108864/int
int
key=NSCellFlags2272629760/int
- string
key=NSContentsDo you want to resume this file?/string
+ string
key=NSContentsDo you want to resume this file?
This-is-a-file/string
object
class=NSFont key=NSSupport
bool
key=IBIsSystemFontYES/bool
double
key=NSSize12/double
- int
key=NSfFlags4883/int
+ int
key=NSfFlags787/int
/object
string
key=NSCellIdentifier_NS:1535/string
reference
key=NSControlView ref=646754310/
@@ -96,7 +96,7 @@
object class=NSButton
id=894576230
reference
key=NSNextResponder ref=1006/
int
key=NSvFlags268/int
- string
key=NSFrame{{98, 12}, {167, 32}}/string
+ string
key=NSFrame{{98, 13}, {216, 32}}/string
reference
key=NSSuperview ref=1006/
reference
key=NSWindow/
reference
key=NSNextKeyView ref=175095676/
@@ -125,7 +125,7 @@
object class=NSButton
id=175095676
reference
key=NSNextResponder ref=1006/
int
key=NSvFlags268/int
- string
key=NSFrame{{301, 12}, {173, 32}}/string
+ string
key=NSFrame{{350, 13}, {160, 32}}/string
reference
key=NSSuperview ref=1006/
reference
key=NSWindow/
reference
key=NSNextKeyView
[vlc-commits] macosx: remove stray code
vlc/vlc-2.2 | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat
Jul 11 15:25:26 2015 +0200| [3187904de00605a00ee41ad40aa7da65fa11a671] |
committer: David Fuhrmann
macosx: remove stray code
(cherry picked from commit 52a35891a4ef1f95e0c677af47837270536a)
Signed-off-by: David Fuhrmann dfuhrm...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=3187904de00605a00ee41ad40aa7da65fa11a671
---
modules/gui/macosx/playlist.h |2 --
modules/gui/macosx/playlist.m | 16
2 files changed, 18 deletions(-)
diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index 59e7276..d84c5de 100644
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -105,8 +105,6 @@
IBOutlet id o_save_accessory_text;
IBOutlet id o_playlist_header;
-
-int currentResumeTimeout;
}
- (void)searchfieldChanged:(NSNotification *)o_notification;
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 8a31ece..2b652c6 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -1506,22 +1506,6 @@
return YES;
}
-- (void)updateAlertWindow:(NSTimer *)timer
-{
-NSAlert *alert = [timer userInfo];
-
---currentResumeTimeout;
-if (currentResumeTimeout = 0) {
-[[alert window] close];
-[NSApp abortModal];
-}
-
-NSString *buttonLabel = _NS(Restart playback);
-buttonLabel = [buttonLabel stringByAppendingFormat:@ (%d),
currentResumeTimeout];
-
-[[[alert buttons] objectAtIndex:2] setTitle:buttonLabel];
-}
-
- (void)continuePlaybackWhereYouLeftOff:(input_thread_t *)p_input_thread
{
NSDictionary *recentlyPlayedFiles = [[NSUserDefaults standardUserDefaults]
objectForKey:@recentlyPlayedMedia];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Create custom resume dialog, refactor
vlc/vlc-2.2 | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jul 11 14:32:20 2015 +0200| [f5ebfa8e5648665c49c4c9474313d7850799b83a] | committer: David Fuhrmann macosx: Create custom resume dialog, refactor Create own resume dialog, which acts the same way as a floating window. Thus it does not disturb the user more than any other VLC panel and consequently does not block the user in doing other operations. This fixes floating behaviour (#13886) any makes it more easy to implement any other fancy_dialog_whatever we might add later. Current design is a copy of the currently used alert window. Also raised the timeout value to 10 secs as users are complaining 6 sec is not long enough. close #13886 (cherry picked from commit dcb7543ff804c9283c1d23e99513fb24225cc589) Signed-off-by: David Fuhrmann dfuhrm...@videolan.org http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f5ebfa8e5648665c49c4c9474313d7850799b83a --- .../Resources/English.lproj/ResumeDialog.xib | 699 .../package/macosx/vlc.xcodeproj/project.pbxproj | 16 + modules/gui/macosx/Modules.am |2 + modules/gui/macosx/ResumeDialogController.h| 57 ++ modules/gui/macosx/ResumeDialogController.m| 126 modules/gui/macosx/VLCVoutWindowController.m |4 + modules/gui/macosx/intf.h |4 + modules/gui/macosx/intf.m | 11 + modules/gui/macosx/playlist.m | 41 +- 9 files changed, 935 insertions(+), 25 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=f5ebfa8e5648665c49c4c9474313d7850799b83a ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: resume dialog: make more space for l10n
vlc/vlc-2.2 | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun
Jul 12 19:16:57 2015 +0200| [addc6b0001c9dd16d674316f2856ac004d41faf3] |
committer: David Fuhrmann
macosx: resume dialog: make more space for l10n
(cherry picked from commit a2aa300a401f1df6d88cb168d8bee7184c2206c6)
Signed-off-by: David Fuhrmann dfuhrm...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=addc6b0001c9dd16d674316f2856ac004d41faf3
---
.../Resources/English.lproj/ResumeDialog.xib | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
b/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
index 9ad09c2..7b180cd 100644
--- a/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
+++ b/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
@@ -41,7 +41,7 @@
object class=NSWindowTemplate id=1005
int key=NSWindowStyleMask1/int
int key=NSWindowBacking2/int
- string key=NSWindowRect{{196, 240}, {650,
145}}/string
+ string key=NSWindowRect{{196, 240}, {684,
133}}/string
int key=NSWTFlags-529006592/int
string key=NSWindowTitle/
string key=NSWindowClassNSWindow/string
@@ -54,7 +54,7 @@
object class=NSTextField
id=646754310
reference
key=NSNextResponder ref=1006/
int
key=NSvFlags268/int
- string
key=NSFrame{{102, 56}, {530, 44}}/string
+ string
key=NSFrame{{102, 49}, {564, 39}}/string
reference
key=NSSuperview ref=1006/
reference
key=NSWindow/
reference
key=NSNextKeyView ref=894576230/
@@ -63,11 +63,11 @@
object
class=NSTextFieldCell key=NSCell id=903659412
int
key=NSCellFlags67108864/int
int
key=NSCellFlags2272629760/int
- string
key=NSContentsDo you want to resume this file?/string
+ string
key=NSContentsDo you want to resume this file?
This-is-a-file/string
object
class=NSFont key=NSSupport
bool
key=IBIsSystemFontYES/bool
double
key=NSSize12/double
- int
key=NSfFlags4883/int
+ int
key=NSfFlags787/int
/object
string
key=NSCellIdentifier_NS:1535/string
reference
key=NSControlView ref=646754310/
@@ -96,7 +96,7 @@
object class=NSButton
id=894576230
reference
key=NSNextResponder ref=1006/
int
key=NSvFlags268/int
- string
key=NSFrame{{98, 12}, {167, 32}}/string
+ string
key=NSFrame{{98, 13}, {216, 32}}/string
reference
key=NSSuperview ref=1006/
reference
key=NSWindow/
reference
key=NSNextKeyView ref=175095676/
@@ -125,7 +125,7 @@
object class=NSButton
id=175095676
reference
key=NSNextResponder ref=1006/
int
key=NSvFlags268/int
- string
key=NSFrame{{301, 12}, {173, 32}}/string
+ string
key=NSFrame{{350, 13}, {160, 32}}/string
reference
key=NSSuperview ref=1006
[vlc-commits] Fix make dist and POTFILES.in
vlc/vlc-2.2 | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jul 11 15:00:24 2015 +0200| [451fb8905311779be0871709e327ed0da6fcc34c] | committer: David Fuhrmann Fix make dist and POTFILES.in (cherry picked from commit 39cafcda8b32a5b3a759ab1dd7dce50e25ed4596) Signed-off-by: David Fuhrmann dfuhrm...@videolan.org http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=451fb8905311779be0871709e327ed0da6fcc34c --- Makefile.am|1 + po/POTFILES.in |2 ++ 2 files changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index b66c21b..febdc63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -152,6 +152,7 @@ EXTRA_DIST += \ extras/package/macosx/Resources/English.lproj/PlaylistAccessoryView.xib \ extras/package/macosx/Resources/English.lproj/PlaylistMenu.xib \ extras/package/macosx/Resources/English.lproj/Preferences.xib \ + extras/package/macosx/Resources/English.lproj/ResumeDialog.xib \ extras/package/macosx/Resources/English.lproj/SharedDialogs.xib \ extras/package/macosx/Resources/English.lproj/SyncTracks.xib \ extras/package/macosx/Resources/English.lproj/VideoEffects.xib \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 0a7c635..62e813e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -586,6 +586,8 @@ modules/gui/macosx/prefs.h modules/gui/macosx/prefs.m modules/gui/macosx/prefs_widgets.h modules/gui/macosx/prefs_widgets.m +modules/gui/macosx/ResumeDialogController.h +modules/gui/macosx/ResumeDialogController.m modules/gui/macosx/simple_prefs.h modules/gui/macosx/simple_prefs.m modules/gui/macosx/StringUtility.h ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] vout/macosx, coreanimation: do not link against opengl
vlc/vlc-2.2 | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jul 4 13:39:56 2015 +0200| [e4e0a222b50ec4c084da4901ede2ee4db6efbf6d] | committer: Felix Paul Kühne vout/macosx,coreanimation: do not link against opengl This is not needed. And for the normal mac builds, we even do not have this library at all. Closes #13838 Manual backport of 86ac78e2 Signed-off-by: Felix Paul Kühne fkue...@videolan.org http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=e4e0a222b50ec4c084da4901ede2ee4db6efbf6d --- modules/video_output/Modules.am |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am index df8fbf6..51bd09c 100644 --- a/modules/video_output/Modules.am +++ b/modules/video_output/Modules.am @@ -21,13 +21,11 @@ endif if HAVE_OSX libvout_macosx_plugin_la_SOURCES = macosx.m opengl.c opengl.h -libvout_macosx_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) -libvout_macosx_plugin_la_LIBADD = $(GL_LIBS) +libvout_macosx_plugin_la_CFLAGS = $(AM_CFLAGS) libvout_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -Wl,-framework,OpenGL,-framework,Cocoa libcaopengllayer_plugin_la_SOURCES = caopengllayer.m opengl.c opengl.h -libcaopengllayer_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) -libcaopengllayer_plugin_la_LIBADD = $(GL_LIBS) +libcaopengllayer_plugin_la_CFLAGS = $(AM_CFLAGS) libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -Wl,-framework,OpenGL,-framework,Cocoa,-framework,QuartzCore vout_LTLIBRARIES += libvout_macosx_plugin.la libcaopengllayer_plugin.la endif ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] vout/macosx, coreanimation: do not link against opengl
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Thu Jul 2 19:10:28 2015 +0200| [86ac78e2d06bf4daef3feb764f945418c0a87a85] | committer: David Fuhrmann vout/macosx,coreanimation: do not link against opengl This is not needed. And for the normal mac builds, we even do not have this library at all. close #13838 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=86ac78e2d06bf4daef3feb764f945418c0a87a85 --- modules/video_output/Makefile.am |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index 40213c6..2388848 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -12,13 +12,11 @@ endif if HAVE_OSX libvout_macosx_plugin_la_SOURCES = video_output/macosx.m video_output/opengl.c video_output/opengl.h -libvout_macosx_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) -libvout_macosx_plugin_la_LIBADD = $(GL_LIBS) +libvout_macosx_plugin_la_CFLAGS = $(AM_CFLAGS) libvout_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -Wl,-framework,OpenGL,-framework,Cocoa libcaopengllayer_plugin_la_SOURCES = video_output/caopengllayer.m video_output/opengl.c video_output/opengl.h -libcaopengllayer_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) -libcaopengllayer_plugin_la_LIBADD = $(GL_LIBS) +libcaopengllayer_plugin_la_CFLAGS = $(AM_CFLAGS) libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -Wl,-framework,OpenGL,-framework,Cocoa,-framework,QuartzCore vout_LTLIBRARIES += libvout_macosx_plugin.la libcaopengllayer_plugin.la endif ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: always delete stored input thread on change (close #14850)
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jun 27
14:51:02 2015 +0200| [ff4982c01902e66818c4e008660c86cd58722f30] | committer:
David Fuhrmann
macosx: always delete stored input thread on change (close #14850)
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ff4982c01902e66818c4e008660c86cd58722f30
---
modules/gui/macosx/intf.m | 39 +++
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 3d901d8..3225a86 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1320,9 +1320,7 @@ static VLCMain *_o_sharedMainInstance = nil;
// This must be called on main thread
- (void)PlaylistItemChanged
{
-input_thread_t *p_input_changed = NULL;
-
-if (p_current_input p_current_input-b_dead) {
+if (p_current_input) {
var_DelCallback(p_current_input, intf-event, InputEvent, [VLCMain
sharedInstance]);
vlc_object_release(p_current_input);
p_current_input = NULL;
@@ -1332,27 +1330,28 @@ static VLCMain *_o_sharedMainInstance = nil;
[[NSNotificationCenter defaultCenter]
postNotificationName:VLCInputChangedNotification
object:nil];
}
-else if (!p_current_input) {
-// object is hold here and released then it is dead
-p_current_input = playlist_CurrentInput(pl_Get(VLCIntf));
-if (p_current_input) {
-var_AddCallback(p_current_input, intf-event, InputEvent,
[VLCMain sharedInstance]);
-[self playbackStatusUpdated];
-[o_mainmenu setRateControlsEnabled: YES];
-
-if ([self activeVideoPlayback] [[o_mainwindow videoView]
isHidden]) {
-[o_mainwindow changePlaylistState: psPlaylistItemChangedEvent];
-}
-p_input_changed = vlc_object_hold(p_current_input);
-
-[[self playlist] currentlyPlayingItemChanged];
+input_thread_t *p_input_changed = NULL;
-[[self playlist] continuePlaybackWhereYouLeftOff:p_current_input];
+// object is hold here and released then it is dead
+p_current_input = playlist_CurrentInput(pl_Get(VLCIntf));
+if (p_current_input) {
+var_AddCallback(p_current_input, intf-event, InputEvent, [VLCMain
sharedInstance]);
+[self playbackStatusUpdated];
+[o_mainmenu setRateControlsEnabled: YES];
-[[NSNotificationCenter defaultCenter]
postNotificationName:VLCInputChangedNotification
-object:nil];
+if ([self activeVideoPlayback] [[o_mainwindow videoView] isHidden])
{
+[o_mainwindow changePlaylistState: psPlaylistItemChangedEvent];
}
+
+p_input_changed = vlc_object_hold(p_current_input);
+
+[[self playlist] currentlyPlayingItemChanged];
+
+[[self playlist] continuePlaybackWhereYouLeftOff:p_current_input];
+
+[[NSNotificationCenter defaultCenter]
postNotificationName:VLCInputChangedNotification
+object:nil];
}
[self updateMetaAndInfo];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: rename PLItemChanged to InputThreadChanged
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jun 27
14:54:42 2015 +0200| [d3b385e2e8059bf5fb120d7ce0595c154829ced5] | committer:
David Fuhrmann
macosx: rename PLItemChanged to InputThreadChanged
This path is about the current input thread, not about playlist
items.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d3b385e2e8059bf5fb120d7ce0595c154829ced5
---
modules/gui/macosx/intf.h |2 +-
modules/gui/macosx/intf.m | 14 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index f8e6517..27ed4f5 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -152,7 +152,7 @@ static NSString * VLCInputChangedNotification =
@VLCInputChangedNotification;
- (void)updateCurrentlyUsedHotkeys;
- (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event force:(BOOL)b_force;
-- (void)PlaylistItemChanged;
+- (void)inputThreadChanged;
- (void)plItemUpdated;
- (void)playbackStatusUpdated;
- (void)sendDistributedNotificationWithUpdatedPlaybackStatus;
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 3225a86..c88e355 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -85,7 +85,7 @@ static void destroyProgressPanel (void *);
static int InputEvent(vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void *);
-static int PLItemChanged(vlc_object_t *, const char *,
+static int InputThreadChanged(vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void *);
static int PLItemUpdated(vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void *);
@@ -387,12 +387,12 @@ static int InputEvent(vlc_object_t *p_this, const char
*psz_var,
return VLC_SUCCESS;
}
-static int PLItemChanged(vlc_object_t *p_this, const char *psz_var,
+static int InputThreadChanged(vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t new_val, void *param)
{
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
-[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector(PlaylistItemChanged) withObject:nil
waitUntilDone:NO];
+[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector(inputThreadChanged) withObject:nil
waitUntilDone:NO];
[o_pool release];
return VLC_SUCCESS;
@@ -680,7 +680,7 @@ static VLCMain *_o_sharedMainInstance = nil;
var_AddCallback(p_intf-p_libvlc, intf-show, ShowController, self);
var_AddCallback(p_intf-p_libvlc, intf-boss, BossCallback, self);
var_AddCallback(p_playlist, item-change, PLItemUpdated, self);
-var_AddCallback(p_playlist, input-current, PLItemChanged, self);
+var_AddCallback(p_playlist, input-current, InputThreadChanged, self);
var_AddCallback(p_playlist, playlist-item-append, PLItemAppended, self);
var_AddCallback(p_playlist, playlist-item-deleted, PLItemRemoved, self);
var_AddCallback(p_playlist, random, PlaybackModeUpdated, self);
@@ -796,7 +796,7 @@ static VLCMain *_o_sharedMainInstance = nil;
* Thus, call additional updaters as we might miss these events if posted
before
* the callbacks are registered.
*/
-[self PlaylistItemChanged];
+[self inputThreadChanged];
[self playbackModeUpdated];
// respect playlist-autostart
@@ -849,7 +849,7 @@ static VLCMain *_o_sharedMainInstance = nil;
var_DelCallback(p_intf, dialog-question, DialogCallback, self);
var_DelCallback(p_intf, dialog-progress-bar, DialogCallback, self);
var_DelCallback(p_playlist, item-change, PLItemUpdated, self);
-var_DelCallback(p_playlist, input-current, PLItemChanged, self);
+var_DelCallback(p_playlist, input-current, InputThreadChanged, self);
var_DelCallback(p_playlist, playlist-item-append, PLItemAppended, self);
var_DelCallback(p_playlist, playlist-item-deleted, PLItemRemoved, self);
var_DelCallback(p_playlist, random, PlaybackModeUpdated, self);
@@ -1318,7 +1318,7 @@ static VLCMain *_o_sharedMainInstance = nil;
}
// This must be called on main thread
-- (void)PlaylistItemChanged
+- (void)inputThreadChanged
{
if (p_current_input) {
var_DelCallback(p_current_input, intf-event, InputEvent, [VLCMain
sharedInstance]);
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Move input-related code to own class
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jun 27 19:35:15 2015 +0200| [0eaddd99fb3e55dc7a3ea252c8392b4fc5fe9581] | committer: David Fuhrmann macosx: Move input-related code to own class http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0eaddd99fb3e55dc7a3ea252c8392b4fc5fe9581 --- modules/gui/macosx/InputManager.h | 62 ++ modules/gui/macosx/InputManager.m | 399 + modules/gui/macosx/Makefile.am|3 +- modules/gui/macosx/intf.h | 31 +-- modules/gui/macosx/intf.m | 360 ++--- 5 files changed, 487 insertions(+), 368 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=0eaddd99fb3e55dc7a3ea252c8392b4fc5fe9581 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: remove unneeded prototypes
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jun 27 23:02:19 2015 +0200| [c77bd876c1c3a0cee141442fa1b6634ff208cb4b] | committer: David Fuhrmann macosx: remove unneeded prototypes http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c77bd876c1c3a0cee141442fa1b6634ff208cb4b --- modules/gui/macosx/intf.m |9 - 1 file changed, 9 deletions(-) diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 6518dc8..53618e6 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -82,15 +82,6 @@ static void updateProgressPanel (void *, const char *, float); static bool checkProgressPanel (void *); static void destroyProgressPanel (void *); -static int PLItemUpdated(vlc_object_t *, const char *, - vlc_value_t, vlc_value_t, void *); - -static int PlaybackModeUpdated(vlc_object_t *, const char *, - vlc_value_t, vlc_value_t, void *); -static int VolumeUpdated(vlc_object_t *, const char *, - vlc_value_t, vlc_value_t, void *); -static int BossCallback(vlc_object_t *, const char *, - vlc_value_t, vlc_value_t, void *); #pragma mark - #pragma mark VLC Interface Object Callbacks ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Move input-related handlers to InputManager, simplify
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jun 27
22:31:54 2015 +0200| [91751dbd6aaeacf12544f44d34c2b5594f66823a] | committer:
David Fuhrmann
macosx: Move input-related handlers to InputManager, simplify
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=91751dbd6aaeacf12544f44d34c2b5594f66823a
---
modules/gui/macosx/InputManager.m| 56 +++---
modules/gui/macosx/MainWindow.m |2 +
modules/gui/macosx/VLCVoutWindowController.m |4 +-
modules/gui/macosx/fspanel.m |2 +-
modules/gui/macosx/intf.h|6 ---
modules/gui/macosx/intf.m| 33 ---
6 files changed, 46 insertions(+), 57 deletions(-)
diff --git a/modules/gui/macosx/InputManager.m
b/modules/gui/macosx/InputManager.m
index 004d915..d34b22c 100644
--- a/modules/gui/macosx/InputManager.m
+++ b/modules/gui/macosx/InputManager.m
@@ -21,6 +21,7 @@
#import InputManager.h
+#import CoreInteraction.h
#import CompatibilityFixes.h
#import ExtensionsManager.h
#import intf.h
@@ -28,6 +29,7 @@
#import MainWindow.h
#import playlist.h
#import playlistinfo.h
+#import TrackSynchronization.h
#import iTunes.h
#import Spotify.h
@@ -60,14 +62,14 @@ static int InputEvent(vlc_object_t *p_this, const char
*psz_var,
[[[VLCMain sharedInstance] mainMenu]
performSelectorOnMainThread:@selector(updatePlaybackRate) withObject: nil
waitUntilDone:NO];
break;
case INPUT_EVENT_POSITION:
-[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector(updatePlaybackPosition) withObject: nil
waitUntilDone:NO];
+[[[VLCMain sharedInstance] mainWindow]
performSelectorOnMainThread:@selector(updateTimeSlider) withObject: nil
waitUntilDone:NO];
break;
case INPUT_EVENT_TITLE:
case INPUT_EVENT_CHAPTER:
-[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector(updateMainMenu) withObject: nil
waitUntilDone:NO];
+[inputManager
performSelectorOnMainThread:@selector(updateMainMenu) withObject: nil
waitUntilDone:NO];
break;
case INPUT_EVENT_CACHE:
-[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector(updateMainWindow) withObject: nil
waitUntilDone: NO];
+[inputManager
performSelectorOnMainThread:@selector(updateMainWindow) withObject:nil
waitUntilDone:NO];
break;
case INPUT_EVENT_STATISTICS:
dispatch_async(dispatch_get_main_queue(), ^{
@@ -84,17 +86,19 @@ static int InputEvent(vlc_object_t *p_this, const char
*psz_var,
break;
case INPUT_EVENT_ITEM_META:
case INPUT_EVENT_ITEM_INFO:
-[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector(updateMainMenu) withObject: nil
waitUntilDone:NO];
-[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector(updateName) withObject: nil
waitUntilDone:NO];
+[inputManager
performSelectorOnMainThread:@selector(updateMainMenu) withObject: nil
waitUntilDone:NO];
+[inputManager performSelectorOnMainThread:@selector(updateName)
withObject: nil waitUntilDone:NO];
[inputManager
performSelectorOnMainThread:@selector(updateMetaAndInfo) withObject: nil
waitUntilDone:NO];
break;
case INPUT_EVENT_BOOKMARK:
break;
case INPUT_EVENT_RECORD:
-[[VLCMain sharedInstance] updateRecordState: var_GetBool(p_this,
record)];
+dispatch_async(dispatch_get_main_queue(), ^{
+[[[VLCMain sharedInstance] mainMenu] updateRecordState:
var_InheritBool(p_this, record)];
+});
break;
case INPUT_EVENT_PROGRAM:
-[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector(updateMainMenu) withObject: nil
waitUntilDone:NO];
+[inputManager
performSelectorOnMainThread:@selector(updateMainMenu) withObject: nil
waitUntilDone:NO];
break;
case INPUT_EVENT_ITEM_EPG:
break;
@@ -102,17 +106,17 @@ static int InputEvent(vlc_object_t *p_this, const char
*psz_var,
break;
case INPUT_EVENT_ITEM_NAME:
-[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector(updateName) withObject: nil
waitUntilDone:NO];
+[inputManager performSelectorOnMainThread:@selector(updateName)
withObject: nil waitUntilDone:NO];
break;
case INPUT_EVENT_AUDIO_DELAY:
case INPUT_EVENT_SUBTITLE_DELAY:
-[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector(updateDelays) withObject:nil
waitUntilDone:NO];
+[inputManager performSelectorOnMainThread:@selector(updateDelays)
withObject:nil waitUntilDone:NO];
break;
case INPUT_EVENT_DEAD:
-[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector
[vlc-commits] macosx: simplify more updaters
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jun 27
22:59:53 2015 +0200| [876dc9a6121155ed96a9a4e3640fd20fa81152ca] | committer:
David Fuhrmann
macosx: simplify more updaters
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=876dc9a6121155ed96a9a4e3640fd20fa81152ca
---
modules/gui/macosx/intf.h |2 --
modules/gui/macosx/intf.m | 52 +++--
2 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 04114d2..c343a12 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -145,8 +145,6 @@ static NSString * VLCInputChangedNotification =
@VLCInputChangedNotification;
- (void)plItemUpdated;
- (void)playbackModeUpdated;
-- (void)updateVolume;
-- (void)showMainWindow;
- (void)showFullscreenController;
- (void)updateTogglePlaylistState;
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 3801c79..6518dc8 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -359,22 +359,21 @@ static int PlaybackModeUpdated(vlc_object_t *p_this,
const char *psz_var,
static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t new_val, void *param)
{
-NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
-[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector(updateVolume) withObject:nil
waitUntilDone:NO];
+dispatch_async(dispatch_get_main_queue(), ^{
+[[[VLCMain sharedInstance] mainWindow] updateVolumeSlider];
+});
-[o_pool release];
return VLC_SUCCESS;
}
static int BossCallback(vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t new_val, void *param)
{
-NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
-
-[[VLCCoreInteraction sharedInstance]
performSelectorOnMainThread:@selector(pause) withObject:nil waitUntilDone:NO];
-[[VLCApplication sharedApplication] hide:nil];
+dispatch_async(dispatch_get_main_queue(), ^{
+[[VLCCoreInteraction sharedInstance] pause];
+[[VLCApplication sharedApplication] hide:nil];
+});
-[o_pool release];
return VLC_SUCCESS;
}
@@ -386,15 +385,21 @@ static int BossCallback(vlc_object_t *p_this, const char
*psz_var,
static int ShowController(vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param)
{
-intf_thread_t * p_intf = VLCIntf;
-if (p_intf) {
-playlist_t * p_playlist = pl_Get(p_intf);
-BOOL b_fullscreen = var_GetBool(p_playlist, fullscreen);
-if (b_fullscreen)
-[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector(showFullscreenController) withObject:nil
waitUntilDone:NO];
-else if (!strcmp(psz_variable, intf-show))
-[[VLCMain sharedInstance]
performSelectorOnMainThread:@selector(showMainWindow) withObject:nil
waitUntilDone:NO];
-}
+
+dispatch_async(dispatch_get_main_queue(), ^{
+
+intf_thread_t * p_intf = VLCIntf;
+if (p_intf) {
+playlist_t * p_playlist = pl_Get(p_intf);
+BOOL b_fullscreen = var_GetBool(p_playlist, fullscreen);
+if (b_fullscreen)
+[[VLCMain sharedInstance] showFullscreenController];
+
+else if (!strcmp(psz_variable, intf-show))
+[[[VLCMain sharedInstance] mainWindow]
makeKeyAndOrderFront:nil];
+}
+
+});
return VLC_SUCCESS;
}
@@ -1225,11 +1230,6 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_info updateMetadata];
}
-- (void)showMainWindow
-{
-[o_mainwindow performSelectorOnMainThread:@selector(makeKeyAndOrderFront:)
withObject:nil waitUntilDone:NO];
-}
-
- (void)showFullscreenController
{
// defer selector here (possibly another time) to ensure that keyWindow is
set properly
@@ -1237,11 +1237,6 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_mainwindow
performSelectorOnMainThread:@selector(showFullscreenController) withObject:nil
waitUntilDone:NO];
}
-- (void)updateVolume
-{
-[o_mainwindow updateVolumeSlider];
-}
-
- (void)playbackModeUpdated
{
playlist_t * p_playlist = pl_Get(VLCIntf);
@@ -1263,9 +1258,6 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_mainmenu setShuffle];
}
-#pragma mark -
-#pragma mark Window updater
-
- (void)setActiveVideoPlayback:(BOOL)b_value
{
assert([NSThread isMainThread]);
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Remove Modules.am and add Makefile.am directly
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Wed Jun 24
19:28:10 2015 +0200| [ff55f00c5363ff76d21897016fd0d5e37cafb7cc] | committer:
David Fuhrmann
macosx: Remove Modules.am and add Makefile.am directly
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ff55f00c5363ff76d21897016fd0d5e37cafb7cc
---
configure.ac |9 +---
modules/gui/macosx/.gitignore |1 -
modules/gui/macosx/Makefile.am | 72
modules/gui/macosx/Modules.am | 104
4 files changed, 73 insertions(+), 113 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3f6589c..4a6b9d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3784,18 +3784,12 @@ AC_ARG_ENABLE(macosx,
[ --enable-macosx Mac OS X gui support (default enabled on Mac OS
X)])
if test x${enable_macosx} != xno -a ${SYS} = darwin
then
- VLC_ADD_LIBS([macosx], [-Wl,-framework,Cocoa -Wl,-framework,Carbon
-Wl,-framework,CoreServices])
- VLC_ADD_OBJCFLAGS([macosx], [-fobjc-exceptions] )
VLC_ADD_PLUGIN([macosx])
- VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit
-Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio
-Wl,-framework,SystemConfiguration -Wl,-framework,ScriptingBridge])
-
if test ! -d ${CONTRIB_DIR}/BGHUDAppKit.framework
then
AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in
${CONTRIB_DIR}])
fi
- VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,BGHUDAppKit])
- VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
fi
AM_CONDITIONAL(ENABLE_MACOSX_UI, [test $enable_macosx != no])
@@ -3810,8 +3804,7 @@ then
then
AC_MSG_ERROR([Sparkle framework is required and was not found in
${CONTRIB_DIR}])
fi
- VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle])
- VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
+
AC_DEFINE([HAVE_SPARKLE], [1], [Define to 1 if sparkle is enabled.])
fi
AM_CONDITIONAL(HAVE_SPARKLE, [test $enable_sparkle != no])
diff --git a/modules/gui/macosx/.gitignore b/modules/gui/macosx/.gitignore
deleted file mode 100644
index 08a6d72..000
--- a/modules/gui/macosx/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.am
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
new file mode 100644
index 000..c574e07
--- /dev/null
+++ b/modules/gui/macosx/Makefile.am
@@ -0,0 +1,72 @@
+include $(top_srcdir)/modules/common.am
+
+guidir = $(pluginsdir)/gui
+
+
+libmacosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions
-F${CONTRIB_DIR}
+libmacosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' \
+ -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,CoreServices \
+ -Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook \
+ -Wl,-framework,WebKit -Wl,-framework,CoreAudio
-Wl,-framework,SystemConfiguration \
+ -Wl,-framework,ScriptingBridge -F${CONTRIB_DIR}
-Wl,-framework,BGHUDAppKit
+
+if HAVE_SPARKLE
+libmacosx_plugin_la_LDFLAGS += -Wl,-framework,Sparkle
+endif
+
+EXTRA_LTLIBRARIES = libmacosx_plugin.la
+gui_LTLIBRARIES = $(LTLIBmacosx)
+
+libmacosx_plugin_la_SOURCES = \
+ about.h about.m \
+ AddonListDataSource.h AddonListDataSource.m \
+ AddonsWindowController.h AddonsWindowController.m \
+ applescript.h applescript.m \
+ AppleRemote.h AppleRemote.m \
+ AudioEffects.h AudioEffects.m \
+ bookmarks.h bookmarks.m \
+ BWQuincyManager.h BWQuincyManager.m \
+ BWQuincyUI.h BWQuincyUI.m \
+ CompatibilityFixes.h \
+ controls.h controls.m \
+ ControlsBar.m ControlsBar.h \
+ ConvertAndSave.h ConvertAndSave.m \
+ coredialogs.h coredialogs.m \
+ CoreInteraction.h CoreInteraction.m \
+ DebugMessageVisualizer.h DebugMessageVisualizer.m \
+ ExtensionsDialogProvider.h ExtensionsDialogProvider.m \
+ ExtensionsManager.h ExtensionsManager.m \
+ eyetv.h eyetv.m \
+ fspanel.h fspanel.m \
+ intf.m intf.h \
+ iTunes.h \
+ KeyboardBacklight.h KeyboardBacklight.m \
+ macosx.m \
+ MainMenu.h MainMenu.m \
+ MainWindow.h MainWindow.m \
+ MainWindowTitle.h MainWindowTitle.m \
+ misc.h misc.m \
+ open.h open.m \
+ output.h output.m \
+ playlist.h playlist.m \
+ playlistinfo.h playlistinfo.m \
+ PLItem.h PLItem.m \
+ PLModel.h PLModel.m \
+ prefs.h prefs.m \
+ prefs_widgets.h prefs_widgets.m \
+ PXSourceList.h PXSourceList.m \
+ PXSourceListDataSource.h PXSourceListDelegate.h \
+ SideBarItem.h SideBarItem.m \
+ SharedDialogs.h SharedDialogs.m \
+ simple_prefs.h simple_prefs.m \
+ SPInvocationGrabbing.h SPInvocationGrabbing.m \
+ SPMediaKeyTap.h SPMediaKeyTap.m \
+ Spotify.h \
+ StringUtility.h StringUtility.m \
+ TrackSynchronization.h TrackSynchronization.m \
+ VideoEffects.h VideoEffects.m
[vlc-commits] ios_dialog_provider: Remove Modules.am
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Wed Jun 24 20:23:50 2015 +0200| [9b221d44d051ca9d7b8dbfaaf6e9697751e95acc] | committer: David Fuhrmann ios_dialog_provider: Remove Modules.am http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b221d44d051ca9d7b8dbfaaf6e9697751e95acc --- configure.ac |1 - modules/gui/Makefile.am| 13 + modules/gui/ios_dialog_provider/.gitignore |1 - modules/gui/ios_dialog_provider/Modules.am |9 - 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index ba8aa2a..e7fc001 100644 --- a/configure.ac +++ b/configure.ac @@ -4150,7 +4150,6 @@ AC_CONFIG_FILES([ lib/Makefile bin/Makefile test/Makefile - modules/gui/ios_dialog_provider/Makefile modules/gui/macosx/Makefile modules/gui/qt4/Makefile modules/gui/skins2/Makefile diff --git a/modules/gui/Makefile.am b/modules/gui/Makefile.am index 46dad91..47bd638 100644 --- a/modules/gui/Makefile.am +++ b/modules/gui/Makefile.am @@ -1,14 +1,11 @@ guidir = $(pluginsdir)/gui gui_LTLIBRARIES = -DIST_SUBDIRS += gui/macosx gui/qt4 gui/skins2 gui/ios_dialog_provider +DIST_SUBDIRS += gui/macosx gui/qt4 gui/skins2 if ENABLE_MACOSX_UI SUBDIRS += gui/macosx endif -if HAVE_IOS -SUBDIRS += gui/ios_dialog_provider -endif if ENABLE_QT4 SUBDIRS += gui/qt4 endif @@ -46,3 +43,11 @@ libminimal_macosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions libminimal_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' -Wl,-framework,Cocoa EXTRA_LTLIBRARIES += libminimal_macosx_plugin.la gui_LTLIBRARIES += $(LTLIBminimal_macosx) + + +libios_dialog_provider_plugin_la_SOURCES = gui/ios_dialog_provider/dialogProvider.m +libios_dialog_provider_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) +libios_dialog_provider_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,UIKit +if HAVE_IOS +gui_LTLIBRARIES += libios_dialog_provider_plugin.la +endif diff --git a/modules/gui/ios_dialog_provider/.gitignore b/modules/gui/ios_dialog_provider/.gitignore deleted file mode 100644 index 08a6d72..000 --- a/modules/gui/ios_dialog_provider/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile.am diff --git a/modules/gui/ios_dialog_provider/Modules.am b/modules/gui/ios_dialog_provider/Modules.am deleted file mode 100644 index 48796dd..000 --- a/modules/gui/ios_dialog_provider/Modules.am +++ /dev/null @@ -1,9 +0,0 @@ -AM_LIBTOOLFLAGS=--tag=CC - -libios_dialog_provider_plugin_la_SOURCES = dialogProvider.m -libios_dialog_provider_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -libios_dialog_provider_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,UIKit - -if HAVE_IOS -gui_LTLIBRARIES += libios_dialog_provider_plugin.la -endif ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] minimal_macosx: Fix compilation, adapt to recent darwinvlc changes
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Wed Jun 24
22:49:54 2015 +0200| [5c253d54d6f3e4ca5d75a599dd6b50a2edd3750d] | committer:
David Fuhrmann
minimal_macosx: Fix compilation, adapt to recent darwinvlc changes
Removes useless killerthread and signal handling. Removes start
in fullscreen, as this is not correctly working.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5c253d54d6f3e4ca5d75a599dd6b50a2edd3750d
---
modules/gui/minimal_macosx/intf.m | 44 -
1 file changed, 4 insertions(+), 40 deletions(-)
diff --git a/modules/gui/minimal_macosx/intf.m
b/modules/gui/minimal_macosx/intf.m
index d6c73b3..7c69e4e 100644
--- a/modules/gui/minimal_macosx/intf.m
+++ b/modules/gui/minimal_macosx/intf.m
@@ -33,8 +33,9 @@
#endif
#include unistd.h
-#import vlc_playlist.h
-#import vlc_vout_window.h
+#include vlc_common.h
+#include vlc_playlist.h
+#include vlc_vout_window.h
#import intf.h
#import VLCMinimalVoutWindow.h
@@ -50,6 +51,7 @@ static void Run (intf_thread_t *p_intf);
int OpenIntf (vlc_object_t *p_this)
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
+msg_Dbg(p_intf, Using minimal macosx interface);
p_intf-p_sys = malloc(sizeof(intf_sys_t));
if (p_intf-p_sys == NULL)
@@ -83,43 +85,12 @@ extern OSErrCPSGetCurrentProcess(CPSProcessSerNum *psn);
extern OSErrCPSEnableForegroundOperation(CPSProcessSerNum *psn, UInt32
_arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
extern OSErrCPSSetFrontProcess(CPSProcessSerNum *psn);
-/*
- * KillerThread: Thread that kill the application
- */
-static void * KillerThread(void *user_data)
-{
-NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
-
-intf_thread_t *p_intf = user_data;
-
-for(;;)
-pause();
-
-/* We are dead, terminate */
-[NSApp terminate: nil];
-[o_pool release];
-return NULL;
-}
/*
* Run: main loop
*/
static void Run(intf_thread_t *p_intf)
{
-sigset_t set;
-
-/* Make sure the force quit menu item does quit instantly.
- * VLC overrides SIGTERM which is sent by the force quit
- * menu item to make sure deamon mode quits gracefully, so
- * we un-override SIGTERM here. */
-sigemptyset(set);
-sigaddset(set, SIGTERM);
-pthread_sigmask(SIG_UNBLOCK, set, NULL);
-
-/* Setup a thread that will monitor the module killing */
-pthread_t killer_thread;
-pthread_create(killer_thread, NULL, KillerThread, p_intf);
-
CPSProcessSerNum PSN;
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
[NSApplication sharedApplication];
@@ -127,9 +98,6 @@ static void Run(intf_thread_t *p_intf)
if (!CPSEnableForegroundOperation(PSN,0x03,0x3C,0x2C,0x1103))
if (!CPSSetFrontProcess(PSN))
[NSApplication sharedApplication];
-[NSApp run];
-
-pthread_join(killer_thread, NULL);
[pool release];
}
@@ -161,10 +129,6 @@ int WindowOpen(vout_window_t *p_wnd, const
vout_window_cfg_t *cfg)
msg_Dbg(p_wnd, returning video window with proposed position x=%i, y=%i,
width=%i, height=%i, cfg-x, cfg-y, cfg-width, cfg-height);
p_wnd-handle.nsobject = [o_window contentView];
-// TODO: find a cleaner way for start in fullscreen
-if (var_GetBool(pl_Get(p_wnd), fullscreen))
-[o_window performSelectorOnMainThread:@selector(enterFullscreen)
withObject:nil waitUntilDone:NO];
-
p_wnd-type = VOUT_WINDOW_TYPE_NSOBJECT;
p_wnd-control = WindowControl;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] minimal_macosx: Remove Modules.am
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Wed Jun 24
19:57:02 2015 +0200| [d33d0f044c4d2a77a5f3eff5caf0ad2a8ed246d2] | committer:
David Fuhrmann
minimal_macosx: Remove Modules.am
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d33d0f044c4d2a77a5f3eff5caf0ad2a8ed246d2
---
configure.ac |4
modules/gui/Makefile.am | 16
modules/gui/minimal_macosx/.gitignore |1 -
modules/gui/minimal_macosx/Modules.am | 13 -
4 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9eb2ec5..ba8aa2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3817,11 +3817,8 @@ AC_ARG_ENABLE(minimal-macosx,
[ --enable-minimal-macosx Minimal Mac OS X support (default disabled)])
if test ${enable_minimal_macosx} = yes -a ${SYS} = darwin
then
- VLC_ADD_LIBS([minimal_macosx], [-Wl,-framework,Cocoa])
- VLC_ADD_OBJCFLAGS([minimal_macosx], [-fobjc-exceptions] )
VLC_ADD_PLUGIN([minimal_macosx])
fi
-AM_CONDITIONAL(ENABLE_MINIMAL_MACOSX, [test $enable_minimal_macosx != no])
dnl
dnl MacOS X dialog provider
@@ -4155,7 +4152,6 @@ AC_CONFIG_FILES([
test/Makefile
modules/gui/ios_dialog_provider/Makefile
modules/gui/macosx/Makefile
- modules/gui/minimal_macosx/Makefile
modules/gui/qt4/Makefile
modules/gui/skins2/Makefile
modules/hw/mmal/Makefile
diff --git a/modules/gui/Makefile.am b/modules/gui/Makefile.am
index fac4dfe..46dad91 100644
--- a/modules/gui/Makefile.am
+++ b/modules/gui/Makefile.am
@@ -1,7 +1,7 @@
guidir = $(pluginsdir)/gui
gui_LTLIBRARIES =
-DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2
gui/ios_dialog_provider
+DIST_SUBDIRS += gui/macosx gui/qt4 gui/skins2 gui/ios_dialog_provider
if ENABLE_MACOSX_UI
SUBDIRS += gui/macosx
@@ -9,9 +9,6 @@ endif
if HAVE_IOS
SUBDIRS += gui/ios_dialog_provider
endif
-if ENABLE_MINIMAL_MACOSX
-SUBDIRS += gui/minimal_macosx
-endif
if ENABLE_QT4
SUBDIRS += gui/qt4
endif
@@ -38,3 +35,14 @@ libmacosx_dialog_provider_plugin_la_LDFLAGS = $(AM_LDFLAGS)
-rpath '$(guidir)' -
EXTRA_LTLIBRARIES += libmacosx_dialog_provider_plugin.la
gui_LTLIBRARIES += $(LTLIBmacosx_dialog_provider)
+
+
+libminimal_macosx_plugin_la_SOURCES = \
+ gui/minimal_macosx/intf.h gui/minimal_macosx/intf.m \
+ gui/minimal_macosx/misc.h gui/minimal_macosx/misc.m \
+ gui/minimal_macosx/VLCMinimalVoutWindow.h
gui/minimal_macosx/VLCMinimalVoutWindow.m \
+ gui/minimal_macosx/macosx.c
+libminimal_macosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions
+libminimal_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)'
-Wl,-framework,Cocoa
+EXTRA_LTLIBRARIES += libminimal_macosx_plugin.la
+gui_LTLIBRARIES += $(LTLIBminimal_macosx)
diff --git a/modules/gui/minimal_macosx/.gitignore
b/modules/gui/minimal_macosx/.gitignore
deleted file mode 100644
index 08a6d72..000
--- a/modules/gui/minimal_macosx/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.am
diff --git a/modules/gui/minimal_macosx/Modules.am
b/modules/gui/minimal_macosx/Modules.am
deleted file mode 100644
index 4c50775..000
--- a/modules/gui/minimal_macosx/Modules.am
+++ /dev/null
@@ -1,13 +0,0 @@
-AM_LIBTOOLFLAGS=--tag=CC
-
-SOURCES_minimal_macosx = \
- misc.m \
- intf.m \
- macosx.c \
- VLCMinimalVoutWindow.m \
- $(NULL)
-
-noinst_HEADERS = \
- intf.h \
- misc.h \
- VLCMinimalVoutWindow.h
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] bin: build a vlc-osx-static similar to vlc-static, to fix tests
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun Jun 21 17:20:35 2015 +0200| [383a20900c66ff18ea59e1feb33f5ed0052315ab] | committer: David Fuhrmann bin: build a vlc-osx-static similar to vlc-static, to fix tests http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=383a20900c66ff18ea59e1feb33f5ed0052315ab --- Makefile.am |4 bin/Makefile.am | 10 ++ 2 files changed, 14 insertions(+) diff --git a/Makefile.am b/Makefile.am index 3c7831a..d0ca19a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -973,7 +973,11 @@ noinst_SCRIPTS = vlc$(EXEEXT) endif vlc$(EXEEXT): +if HAVE_DARWIN + $(AM_V_GEN)$(LN_S) -f bin/vlc-osx-static vlc +else $(AM_V_GEN)$(LN_S) -f bin/vlc-static$(EXEEXT) vlc$(EXEEXT) +endif TESTS = test/run_vlc.sh dist_noinst_SCRIPTS += test/run_vlc.sh diff --git a/bin/Makefile.am b/bin/Makefile.am index 14bbc28..6033e50 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -2,6 +2,7 @@ # if HAVE_DARWIN bin_PROGRAMS = vlc-osx +noinst_PROGRAMS = vlc-osx-static else bin_PROGRAMS = vlc noinst_PROGRAMS = vlc-static @@ -31,10 +32,19 @@ if HAVE_WIN32 vlc_SOURCES = winvlc.c noinst_DATA += vlc_win32_rc.rc endif + if HAVE_DARWIN vlc_osx_SOURCES = darwinvlc.m vlc_osx_LDFLAGS = $(LDFLAGS_vlc) -Wl,-framework,CoreFoundation,-framework,Cocoa vlc_osx_LDADD = ../lib/libvlc.la + +vlc_osx_static_SOURCES = $(vlc_osx_SOURCES) +vlc_osx_static_OBJCFLAGS = $(AM_OBJCFLAGS) \ + -DTOP_BUILDDIR=\$$(cd $(top_builddir); pwd)\ \ + -DTOP_SRCDIR=\$$(cd $(top_srcdir); pwd)\ \ + $(NULL) +vlc_osx_static_LDFLAGS = $(vlc_osx_LDFLAGS) -static +vlc_osx_static_LDADD = $(vlc_osx_LDADD) endif vlc_wrapper_SOURCES = rootwrap.c ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] mac packaging: do not depend on vlc target
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jun 20 12:02:48 2015 +0200| [318f3eaac413699107c1a24a5d7f7f64a50596aa] | committer: David Fuhrmann mac packaging: do not depend on vlc target The vlc target only creates a symlink, so it makes no sense to depend on that in any way. This also fixes unneeded recreation of the package with every make invocation. http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=318f3eaac413699107c1a24a5d7f7f64a50596aa --- extras/package/macosx/package.mak |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak index ea16038..087cf32 100644 --- a/extras/package/macosx/package.mak +++ b/extras/package/macosx/package.mak @@ -25,7 +25,7 @@ VLC.app: VLC-tmp rm -Rf $@/Contents/Frameworks/BGHUDAppKit.framework/Versions/A/Resources/README.textile -VLC-tmp: vlc +VLC-tmp: $(AM_V_GEN)for i in src lib share; do \ (cd $$i $(MAKE) $(AM_MAKEFLAGS) install $(silentstd)); \ done ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] darwinvlc/macosx: rework binary, start main loop in darwinvlc
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Mon Jun 15 19:35:08 2015 +0200| [cc07bce0d25c0defcd5576005515df3b0a7531bb] | committer: David Fuhrmann darwinvlc/macosx: rework binary, start main loop in darwinvlc This moves the main loop out of the macosx interface module. Instead, the open callback only initializes the interface and the close callback cleans up stuff. The mainloop is now started in darwinvlc.m. In case the mac interface is not used, a CoreFoundation mainloop is solely started to wait for termination events. Additionally, this cleans up darwinvlc.m, and fixes signal handling, which was dead code so far (in case the interface was used). Now, GCD is used to catch SIGINT and SIGTERM in order to allow ordinary shutdown. refs #14362 close #6354 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cc07bce0d25c0defcd5576005515df3b0a7531bb --- bin/Makefile.am |2 +- bin/darwinvlc.m | 218 --- modules/gui/macosx/intf.m | 74 ++- modules/gui/macosx/macosx.m |2 +- 4 files changed, 151 insertions(+), 145 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=cc07bce0d25c0defcd5576005515df3b0a7531bb ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: remove o_appLock, rename f_appExit
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jun 20
12:30:28 2015 +0200| [25f5b20564641617bd4e871ea8fa1e04a83cfb95] | committer:
David Fuhrmann
macosx: remove o_appLock, rename f_appExit
Lock is not needed anymore, as this variable is only accessed
from the main thread.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=25f5b20564641617bd4e871ea8fa1e04a83cfb95
---
modules/gui/macosx/intf.h |2 ++
modules/gui/macosx/intf.m | 19 +++
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index bbb5283..f8e6517 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -98,6 +98,8 @@ static NSString * VLCInputChangedNotification =
@VLCInputChangedNotification;
IBOutlet VLCControls * o_controls; /* VLCControls*/
IBOutlet VLCPlaylist * o_playlist; /* VLCPlaylist*/
+bool b_intf_terminating; /* Makes sure applicationWillTerminate will be
called only once */
+
AppleRemote * o_remote;
BOOL b_remote_button_hold; /* true as long as the user holds the
left,right,plus or minus on the remote control */
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index d5b864d..3d901d8 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -102,7 +102,6 @@ static int BossCallback(vlc_object_t *, const char *,
static atomic_bool b_intf_starting = ATOMIC_VAR_INIT(false);
-static NSLock * o_appLock = nil;// controls access to f_appExit
static NSLock * o_vout_provider_lock = nil;
@@ -119,7 +118,6 @@ int OpenIntf (vlc_object_t *p_this)
[VLCApplication sharedApplication];
-o_appLock = [[NSLock alloc] init];
o_vout_provider_lock = [[NSLock alloc] init];
[[VLCMain sharedInstance] setIntf: p_intf];
@@ -141,7 +139,6 @@ void CloseIntf (vlc_object_t *p_this)
msg_Dbg(p_this, Closing macosx interface);
[[VLCMain sharedInstance] applicationWillTerminate:nil];
-[o_appLock release];
[o_vout_provider_lock release];
o_vout_provider_lock = nil;
[o_pool release];
@@ -812,29 +809,19 @@ static VLCMain *_o_sharedMainInstance = nil;
PL_UNLOCK;
}
-/* don't allow a double termination call. If the user has
- * already invoked the quit then simply return this time. */
-static bool f_appExit = false;
-
#pragma mark -
#pragma mark Termination
- (BOOL)isTerminating
{
-return f_appExit;
+return b_intf_terminating;
}
- (void)applicationWillTerminate:(NSNotification *)notification
{
-bool isTerminating;
-
-[o_appLock lock];
-isTerminating = f_appExit;
-f_appExit = true;
-[o_appLock unlock];
-
-if (isTerminating)
+if (b_intf_terminating)
return;
+b_intf_terminating = true;
[self resumeItunesPlayback:nil];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix window ordering during startup (close #14486)
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jun 20 11:57:14 2015 +0200| [9434662c9228278ccd18fd649e71fa809745a576] | committer: David Fuhrmann macosx: fix window ordering during startup (close #14486) According to docu, application:willFinishLaunching: will be called as one of the first steps of [NSApp run], before the main loop will be actually started. Thus, it should make no performance difference if we load the main window already in openIntf(). For some unknown reasons, a direct call to makeKeyAndOrderFront works in run(), but not in app:willFinishLaunching:, though. http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9434662c9228278ccd18fd649e71fa809745a576 --- modules/gui/macosx/intf.m |9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index dc56363..1239e2d 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -132,6 +132,9 @@ int OpenIntf (vlc_object_t *p_this) [NSBundle loadNibNamed: @MainMenu owner: NSApp]; +[NSBundle loadNibNamed:@MainWindow owner: [VLCMain sharedInstance]]; +[[[VLCMain sharedInstance] mainWindow] makeKeyAndOrderFront:nil]; + [o_pool release]; return VLC_SUCCESS; } @@ -769,12 +772,6 @@ static VLCMain *_o_sharedMainInstance = nil; items_at_launch = p_playlist-p_local_category-i_children; PL_UNLOCK; -[NSBundle loadNibNamed:@MainWindow owner: self]; - -// This cannot be called directly here, as the main loop is not running yet so it would have no effect. -// So lets enqueue it into the loop for later execution. -[o_mainwindow performSelector:@selector(makeKeyAndOrderFront:) withObject:nil afterDelay:0]; - #ifdef HAVE_SPARKLE [[SUUpdater sharedUpdater] setDelegate:self]; #endif ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: rename vlc target to vlc-bundle-helper
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jun 13
09:28:54 2015 +0200| [ce5d8671e01237befc472818fd65211d467b7b51] | committer:
David Fuhrmann
macosx: rename vlc target to vlc-bundle-helper
This is the target called from our makefile scripts. Rename it
so it is more clear that it should not be called in Xcode
directly.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ce5d8671e01237befc472818fd65211d467b7b51
---
extras/package/macosx/package.mak |2 +-
extras/package/macosx/vlc.xcodeproj/project.pbxproj | 10 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 630eb9b..f709d81 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -45,7 +45,7 @@ VLC-tmp: vlc
mkdir -p $(top_builddir)/tmp/modules/gui/macosx
cd $(srcdir)/modules/gui/macosx/ cp *.h *.m
$(abs_top_builddir)/tmp/modules/gui/macosx/
cd $(top_builddir)/tmp/extras/package/macosx \
- xcodebuild -target vlc SYMROOT=../../../build
DSTROOT=../../../build $(silentstd)
+ xcodebuild -target vlc-bundle-helper SYMROOT=../../../build
DSTROOT=../../../build $(silentstd)
cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $@
mkdir -p $@/Contents/Frameworks cp -R $(CONTRIB_DIR)/Growl.framework
$@/Contents/Frameworks/
if HAVE_SPARKLE
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 9b5f12f..848c7d3 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -3024,9 +3024,9 @@
productReference = 1CCB5F2F1A62A6A5004C3E90 /*
pseudo-vlc.app */;
productType = com.apple.product-type.application;
};
- CC402EAE0E00ABBB006A4BA4 /* vlc */ = {
+ CC402EAE0E00ABBB006A4BA4 /* vlc-bundle-helper */ = {
isa = PBXNativeTarget;
- buildConfigurationList = CC402F460E00ABBB006A4BA4 /*
Build configuration list for PBXNativeTarget vlc */;
+ buildConfigurationList = CC402F460E00ABBB006A4BA4 /*
Build configuration list for PBXNativeTarget vlc-bundle-helper */;
buildPhases = (
CC402EAF0E00ABBB006A4BA4 /* Resources */,
CC402F400E00ABBB006A4BA4 /* Frameworks */,
@@ -3036,7 +3036,7 @@
);
dependencies = (
);
- name = vlc;
+ name = vlc-bundle-helper;
productInstallPath = $(HOME)/Library/Bundles;
productName = vlc;
productReference = CC402F4B0E00ABBB006A4BA4 /*
VLC.bundle */;
@@ -3085,7 +3085,7 @@
projectDirPath = ;
projectRoot = ../../..;
targets = (
- CC402EAE0E00ABBB006A4BA4 /* vlc */,
+ CC402EAE0E00ABBB006A4BA4 /* vlc-bundle-helper
*/,
1CCB5F2E1A62A6A5004C3E90 /* pseudo-vlc */,
1C42A6DF1B19F597007D87B2 /* Build deps */,
1C07EDFD1B1CD6B300A0BBDB /* Bootstrap project
*/,
@@ -5015,7 +5015,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
};
- CC402F460E00ABBB006A4BA4 /* Build configuration list for
PBXNativeTarget vlc */ = {
+ CC402F460E00ABBB006A4BA4 /* Build configuration list for
PBXNativeTarget vlc-bundle-helper */ = {
isa = XCConfigurationList;
buildConfigurations = (
CC402F470E00ABBB006A4BA4 /* Development */,
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: disable isVisibleOnLaunch and isRestorable for main window
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jun 13
09:23:31 2015 +0200| [43822a61f7be5bb1f9b5c74d470ae57f14c80109] | committer:
David Fuhrmann
macosx: disable isVisibleOnLaunch and isRestorable for main window
This workarounds a bug in the cocoa framework.
close #9903
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=43822a61f7be5bb1f9b5c74d470ae57f14c80109
---
.../macosx/Resources/English.lproj/MainWindow.xib | 50 ++--
1 file changed, 24 insertions(+), 26 deletions(-)
diff --git a/extras/package/macosx/Resources/English.lproj/MainWindow.xib
b/extras/package/macosx/Resources/English.lproj/MainWindow.xib
index 0e3fd73..b8f5fe0 100644
--- a/extras/package/macosx/Resources/English.lproj/MainWindow.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainWindow.xib
@@ -2,13 +2,13 @@
archive type=com.apple.InterfaceBuilder3.Cocoa.XIB version=8.00
data
int key=IBDocument.SystemTarget1060/int
- string key=IBDocument.SystemVersion14B25/string
- string key=IBDocument.InterfaceBuilderVersion6254/string
- string key=IBDocument.AppKitVersion1343.16/string
- string key=IBDocument.HIToolboxVersion755.00/string
+ string key=IBDocument.SystemVersion14D136/string
+ string key=IBDocument.InterfaceBuilderVersion7706/string
+ string key=IBDocument.AppKitVersion1347.57/string
+ string key=IBDocument.HIToolboxVersion758.70/string
object class=NSMutableDictionary
key=IBDocument.PluginVersions
string
key=NS.key.0com.apple.InterfaceBuilder.CocoaPlugin/string
- string key=NS.object.06254/string
+ string key=NS.object.07706/string
/object
array key=IBDocument.IntegratedClassDependencies
stringNSBox/string
@@ -90,10 +90,7 @@
string key=NSFrameSize{199,
272}/string
reference key=NSSuperview
ref=18556274/
reference key=NSWindow/
-
object class=NSAppearance
key=NSAppearance
-
string
key=NSAppearanceNameNSAppearanceNameVibrantLight/string
-
string
key=NSAppearanceBundleIdentifiercom.apple.systemappearance/string
-
/object
+
reference key=NSNextKeyView
ref=11557666/
bool key=NSEnabledYES/bool
bool
key=NSAllowsLogicalLayoutDirectionNO/bool
bool
key=NSControlAllowsExpansionToolTipsYES/bool
@@ -223,7 +220,6 @@
string key=NSFrame{{-100, -100}, {212, 15}}/string
reference key=NSSuperview ref=979766179/
reference key=NSWindow/
-
reference key=NSNextKeyView/
bool key=NSAllowsLogicalLayoutDirectionNO/bool
string key=NSControlAction_doScroller:/string
reference key=NSControlTarget ref=979766179/
@@ -236,7 +232,7 @@
string key=NSFrameSize{201, 274}/string
[vlc-commits] macosx: add build schemes to Xcode project for complete compilation
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun May 31 23:22:47 2015 +0200| [c5ffebd6665a846992cd78d9274e9a441617047f] | committer: David Fuhrmann macosx: add build schemes to Xcode project for complete compilation This adds several build targets to the project for doing all needed steps for compilation. Additionally, they are some schemes included which are intended to be used for compilation: - Rebuild everything builds all targets in the right order, including extras/tools, contribs, bootstrap, configure, make and make VLC-dev. This scheme should be used once to setup everything. For later builds, you should switch to the Make project scheme. - Make project runs make make VLC-dev.app, to only recompile files if needed. Additionally, it creates a VLC-dev.app for testing. The end result will be stored in the build folder set in Xcode. Both VLC.app and VLC-dev.app can be accessed by using the Build artifacts folder, and showing the files in finder. http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c5ffebd6665a846992cd78d9274e9a441617047f --- .../package/macosx/vlc.xcodeproj/project.pbxproj | 824 ++-- .../xcshareddata/xcschemes/Make project.xcscheme | 82 ++ .../xcschemes/Rebuild everything.xcscheme | 142 3 files changed, 999 insertions(+), 49 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=c5ffebd6665a846992cd78d9274e9a441617047f ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix checked state for extensions (close #14855)
vlc/vlc-2.2 | branch: master | David Fuhrmann dfuhrm...@videolan.org | Thu
Jun 11 19:14:50 2015 +0200| [1ab29cfa0cb0222a19ffba7d09476553f1fc64dc] |
committer: David Fuhrmann
macosx: fix checked state for extensions (close #14855)
(cherry picked from commit d768b02e609ec5c3295c09a54dd6dd425df687b1)
Signed-off-by: David Fuhrmann dfuhrm...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=1ab29cfa0cb0222a19ffba7d09476553f1fc64dc
---
modules/gui/macosx/ExtensionsDialogProvider.m | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/modules/gui/macosx/ExtensionsDialogProvider.m
b/modules/gui/macosx/ExtensionsDialogProvider.m
index d15966c..c723ab9 100644
--- a/modules/gui/macosx/ExtensionsDialogProvider.m
+++ b/modules/gui/macosx/ExtensionsDialogProvider.m
@@ -192,9 +192,9 @@ static void updateControlFromWidget(NSView *control,
extension_widget_t *widget,
{
assert([control isKindOfClass:[NSButton class]]);
NSButton *button = (NSButton *)control;
-if (!widget-psz_text)
-break;
-[button setTitle:[NSString stringWithUTF8String:widget-psz_text]];
+[button setTitle:toNSStr(widget-psz_text)];
+if (widget-type == EXTENSION_WIDGET_CHECK_BOX)
+[button setState:widget-b_checked ? NSOnState : NSOffState];
break;
}
case EXTENSION_WIDGET_DROPDOWN:
@@ -342,7 +342,10 @@ static ExtensionsDialogProvider *_o_sharedInstance = nil;
extension_widget_t *widget = [button widget];
vlc_mutex_lock(widget-p_dialog-lock);
-extension_WidgetClicked(widget-p_dialog, widget);
+if (widget-type == EXTENSION_WIDGET_BUTTON)
+extension_WidgetClicked(widget-p_dialog, widget);
+else
+widget-b_checked = [button state] == NSOnState;
vlc_mutex_unlock(widget-p_dialog-lock);
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: disable isVisibleOnLaunch for main window
vlc/vlc-2.2 | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat Jun 13 11:14:23 2015 +0200| [4dc9d044b328195e913650fe1cb91b7e868a2053] | committer: David Fuhrmann macosx: disable isVisibleOnLaunch for main window Manual and partly cherry-pick of 43822a61f7be5bb1f9b5c74d470ae57f14c80109 close #9903 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=4dc9d044b328195e913650fe1cb91b7e868a2053 --- .../macosx/Resources/English.lproj/MainWindow.xib | 92 1 file changed, 15 insertions(+), 77 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=4dc9d044b328195e913650fe1cb91b7e868a2053 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] lua readme: mention state as second parameter for add_check_box
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Thu Jun 11 19:25:39 2015 +0200| [377bab66f9721a22a9c1bb82acd84cd71db45b14] | committer: David Fuhrmann lua readme: mention state as second parameter for add_check_box http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=377bab66f9721a22a9c1bb82acd84cd71db45b14 --- share/lua/README.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/lua/README.txt b/share/lua/README.txt index 84f322f..a3fea24 100644 --- a/share/lua/README.txt +++ b/share/lua/README.txt @@ -71,7 +71,7 @@ d:add_label( text, ... ): Create a text label with caption text (string). d:add_html( text, ... ): Create a rich text label with caption text (string), that supports basic HTML formatting (such as i or h1 for instance). d:add_text_input( text, ... ): Create an editable text field, in order to read user input. d:add_password( text, ... ): Create an editable text field, in order to read user input. Text entered in this box will not be readable (replaced by asterisks). -d:add_check_box( text, ... ): Create a check box with a text. They have a boolean state (true/false). +d:add_check_box( text, state, ... ): Create a check box with a text. They have a boolean state (true/false). d:add_dropdown( ... ): Create a drop-down widget. Only 1 element can be selected the same time. d:add_list( ... ): Create a list widget. Allows multiple or empty selections. d:add_image( path, ... ): Create an image label. path is a relative or absolute path to the image on the local computer. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: only enable sparkle update if --enable-update-check is set
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun May 31 13:12:46 2015 +0200| [3249695dd5d274c8d92bda12f4361e9b154807f5] | committer: David Fuhrmann macosx: only enable sparkle update if --enable-update-check is set http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3249695dd5d274c8d92bda12f4361e9b154807f5 --- .../macosx/Resources/English.lproj/MainMenu.xib| 58 +++ .../macosx/Resources/English.lproj/Preferences.xib | 172 ++-- modules/gui/macosx/MainMenu.m | 11 ++ modules/gui/macosx/intf.m |7 + modules/gui/macosx/simple_prefs.m | 16 ++ 5 files changed, 187 insertions(+), 77 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=3249695dd5d274c8d92bda12f4361e9b154807f5 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Update NEWS
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun May 31 14:03:41 2015 +0200| [21c71b179941761aea2580921d720f2da041f560] | committer: David Fuhrmann Update NEWS http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=21c71b179941761aea2580921d720f2da041f560 --- NEWS |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 4114f5a..21cf753 100644 --- a/NEWS +++ b/NEWS @@ -96,8 +96,9 @@ Service Discovery: * Rewrite of the UPnP service discovery Mac OS X Interface + * Add support for keyboard blacklight dimming during fullscreen video playback * new AppleScript API giving access to audio desynchronization - * Port to Yosemite X.10 + * Support for building with disabled sparkle update mechanism Qt interface: * Batch convert support ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] mac/configure.sh: Enable sparkle update by default
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sun May 31 14:02:29 2015 +0200| [e811f01c12a80f09f14e227959d9d8444c78a264] | committer: David Fuhrmann mac/configure.sh: Enable sparkle update by default http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e811f01c12a80f09f14e227959d9d8444c78a264 --- extras/package/macosx/configure.sh |1 + 1 file changed, 1 insertion(+) diff --git a/extras/package/macosx/configure.sh b/extras/package/macosx/configure.sh index d4af059..03b0a0d 100755 --- a/extras/package/macosx/configure.sh +++ b/extras/package/macosx/configure.sh @@ -16,6 +16,7 @@ esac OPTIONS= --prefix=`pwd`/vlc_install_dir +--enable-update-check --enable-macosx --enable-merge-ffmpeg --enable-growl ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix bootstrap
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat May 30 14:01:33 2015 +0200| [72b7034fda744bda2c6ba1707aa39ec05d93c9c0] | committer: David Fuhrmann macosx: fix bootstrap This line is not needed, the module is already linked against IOKit. http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=72b7034fda744bda2c6ba1707aa39ec05d93c9c0 --- modules/gui/macosx/Modules.am |1 - 1 file changed, 1 deletion(-) diff --git a/modules/gui/macosx/Modules.am b/modules/gui/macosx/Modules.am index 7a6f821..6588a0b 100644 --- a/modules/gui/macosx/Modules.am +++ b/modules/gui/macosx/Modules.am @@ -1,5 +1,4 @@ AM_LIBTOOLFLAGS=--tag=CC -AM_LDFLAGS=-framework IOKit SOURCES_macosx = \ CompatibilityFixes.h \ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] decomp: fix compilation
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Thu May 21 18:50:01 2015 +0200| [96759381b1d605cceb5d852c84555d10258e8731] | committer: David Fuhrmann decomp: fix compilation http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=96759381b1d605cceb5d852c84555d10258e8731 --- modules/stream_filter/decomp.c |2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/stream_filter/decomp.c b/modules/stream_filter/decomp.c index 71f8758..19ea419 100644 --- a/modules/stream_filter/decomp.c +++ b/modules/stream_filter/decomp.c @@ -46,6 +46,8 @@ # undef HAVE_VMSPLICE #endif +#include signal.h + static int OpenGzip (vlc_object_t *); static int OpenBzip2 (vlc_object_t *); static int OpenXZ (vlc_object_t *); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] src: fix compilation on platforms without MSG_NOSIGNAL
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Thu May 21 18:49:44 2015 +0200| [342d6965bd10116fe64c57cd01f9abec21a7ed77] | committer: David Fuhrmann src: fix compilation on platforms without MSG_NOSIGNAL http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=342d6965bd10116fe64c57cd01f9abec21a7ed77 --- src/network/rootbind.c |3 +++ 1 file changed, 3 insertions(+) diff --git a/src/network/rootbind.c b/src/network/rootbind.c index 9c24c97..64104d8 100644 --- a/src/network/rootbind.c +++ b/src/network/rootbind.c @@ -36,6 +36,9 @@ int rootwrap_bind (int, int, int, const struct sockaddr *, size_t); #ifdef ENABLE_ROOTWRAP +#include vlc_common.h +#include vlc_network.h + #include string.h #include stdlib.h ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] decomp: fix compilation
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Thu May 21 18:50:01 2015 +0200| [3d710f6489adabfa6f54817594b6a44cd21cee66] | committer: David Fuhrmann decomp: fix compilation http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3d710f6489adabfa6f54817594b6a44cd21cee66 --- modules/stream_filter/decomp.c |2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/stream_filter/decomp.c b/modules/stream_filter/decomp.c index 71f8758..19ea419 100644 --- a/modules/stream_filter/decomp.c +++ b/modules/stream_filter/decomp.c @@ -46,6 +46,8 @@ # undef HAVE_VMSPLICE #endif +#include signal.h + static int OpenGzip (vlc_object_t *); static int OpenBzip2 (vlc_object_t *); static int OpenXZ (vlc_object_t *); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] fix POTFILES.in
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat May 16 22:08:43 2015 +0200| [dce178aa68d6d7fe39407659e878a00f48bf1ba2] | committer: David Fuhrmann fix POTFILES.in http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dce178aa68d6d7fe39407659e878a00f48bf1ba2 --- po/POTFILES.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 773a728..acb4945 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -536,8 +536,8 @@ modules/demux/xiph_metadata.h modules/demux/xiph_metadata.c modules/gui/macosx/about.h modules/gui/macosx/about.m -modules/gui/macosx/AddonManager.h -modules/gui/macosx/AddonManager.m +modules/gui/macosx/AddonsWindowController.h +modules/gui/macosx/AddonsWindowController.m modules/gui/macosx/AppleRemote.h modules/gui/macosx/AppleRemote.m modules/gui/macosx/applescript.h ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Use NSWindowController for error panel, lazy initialization
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat May 16 21:55:13 2015 +0200| [0aad5ff31efeee398742f957c185c8532dbb412a] | committer: David Fuhrmann macosx: Use NSWindowController for error panel, lazy initialization http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0aad5ff31efeee398742f957c185c8532dbb412a --- .../macosx/Resources/English.lproj/ErrorPanel.xib | 45 +-- modules/gui/macosx/MainMenu.m |2 +- modules/gui/macosx/coredialogs.h | 46 ++-- modules/gui/macosx/coredialogs.m | 35 +++ 4 files changed, 72 insertions(+), 56 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/ErrorPanel.xib b/extras/package/macosx/Resources/English.lproj/ErrorPanel.xib index 5c41dbc..bb1d7b8 100644 --- a/extras/package/macosx/Resources/English.lproj/ErrorPanel.xib +++ b/extras/package/macosx/Resources/English.lproj/ErrorPanel.xib @@ -32,7 +32,7 @@ /object array class=NSMutableArray key=IBDocument.RootObjects id=638050510 object class=NSCustomObject id=923016430 - string key=NSClassNameVLCErrorPanel/string + string key=NSClassNameErrorWindowController/string /object object class=NSCustomObject id=159526500 string key=NSClassNameFirstResponder/string @@ -304,14 +304,6 @@ int key=connectionID13/int /object object class=IBConnectionRecord - object class=IBOutletConnection key=connection - string key=labelo_window/string - reference key=source ref=923016430/ - reference key=destination ref=883469087/ - /object - int key=connectionID14/int - /object - object class=IBConnectionRecord object class=IBActionConnection key=connection string key=labelcleanupTable:/string reference key=source ref=923016430/ @@ -321,6 +313,14 @@ /object object class=IBConnectionRecord object class=IBOutletConnection key=connection + string key=labelwindow/string + reference key=source ref=923016430/ + reference key=destination ref=883469087/ + /object + int key=connectionID75/int + /object + object class=IBConnectionRecord + object class=IBOutletConnection key=connection string key=labeldataSource/string reference key=source ref=523335037/ reference key=destination ref=923016430/ @@ -474,13 +474,13 @@ nil key=activeLocalization/ dictionary class=NSMutableDictionary key=localizations/ nil key=sourceID/ - int key=maxID74/int + int key=maxID75/int /object object class=IBClassDescriber key=IBDocument.Classes array class=NSMutableArray key=referencedPartialClassDescriptions object class=IBPartialClassDescription - string key=classNameVLCErrorPanel/string - string key=superclassNameNSObject/string + string key=classNameErrorWindowController/string + string key=superclassNameNSWindowController/string object class=NSMutableDictionary key=actions string key=NS.key.0cleanupTable:/string string key=NS.object.0id/string @@ -517,7 +517,7 @@ /object /object object class=IBPartialClassDescription - string key=classNameVLCErrorPanel/string
[vlc-commits] macosx: Remove sharedInstance from About window and rework
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat May 16 12:24:31 2015 +0200| [491bef0b30ff9771eb0298033a4cede5e1994f31] | committer: David Fuhrmann macosx: Remove sharedInstance from About window and rework Removes sharedInstance from About window controller, and rework as a NSWindowController subclass. This is the new owner of the xib and thus instantiated outside the nib bundle. Splits Help window in own xib and add own NSWindowController as well. refs #5556 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=491bef0b30ff9771eb0298033a4cede5e1994f31 --- Makefile.am|1 + .../macosx/Resources/English.lproj/About.xib | 630 .../macosx/Resources/English.lproj/Help.xib| 408 + .../package/macosx/vlc.xcodeproj/project.pbxproj | 13 + modules/gui/macosx/MainMenu.h |8 +- modules/gui/macosx/MainMenu.m | 17 +- modules/gui/macosx/about.h | 21 +- modules/gui/macosx/about.m | 254 8 files changed, 694 insertions(+), 658 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=491bef0b30ff9771eb0298033a4cede5e1994f31 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix crash in str_format_meta
vlc/vlc-2.2 | branch: master | David Fuhrmann dfuhrm...@videolan.org | Thu
May 7 19:29:51 2015 +0200| [ca28163fb0ed72a5aa2fa73c0b80475796985a23] |
committer: David Fuhrmann
macosx: fix crash in str_format_meta
(cherry picked from commit e823a595a8aa041de17e23d8f84bcb90d5d48702)
Signed-off-by: David Fuhrmann dfuhrm...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=ca28163fb0ed72a5aa2fa73c0b80475796985a23
---
modules/gui/macosx/CoreInteraction.m | 12 +++-
modules/gui/macosx/MainWindow.m | 12 +++-
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/modules/gui/macosx/CoreInteraction.m
b/modules/gui/macosx/CoreInteraction.m
index 1fc4d6e..b749512 100644
--- a/modules/gui/macosx/CoreInteraction.m
+++ b/modules/gui/macosx/CoreInteraction.m
@@ -258,12 +258,14 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
return nil;
}
-NSString *o_name;
+NSString *o_name = @;
char *format = var_InheritString(VLCIntf, input-title-format);
-char *formated = str_format_meta(p_input, format);
-free(format);
-o_name = [NSString stringWithUTF8String:formated];
-free(formated);
+if (format) {
+char *formated = str_format_meta(p_input, format);
+free(format);
+o_name = toNSStr(formated);
+free(formated);
+}
NSURL * o_url = [NSURL URLWithString:[NSString
stringWithUTF8String:psz_uri]];
free(psz_uri);
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 875c71f..b712413 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -695,14 +695,16 @@ static VLCMainWindow *_o_sharedInstance = nil;
input_thread_t * p_input;
p_input = pl_CurrentInput(VLCIntf);
if (p_input) {
-NSString *aString;
+NSString *aString = @;
if (!config_GetPsz(VLCIntf, video-title)) {
char *format = var_InheritString(VLCIntf, input-title-format);
-char *formated = str_format_meta(p_input, format);
-free(format);
-aString = [NSString stringWithUTF8String:formated];
-free(formated);
+if (format) {
+char *formated = str_format_meta(p_input, format);
+free(format);
+aString = toNSStr(formated);
+free(formated);
+}
} else
aString = [NSString stringWithUTF8String:config_GetPsz(VLCIntf,
video-title)];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix crash in str_format_meta
vlc | branch: master | David Fuhrmann dfuhrm...@videolan.org | Thu May 7
19:29:51 2015 +0200| [e823a595a8aa041de17e23d8f84bcb90d5d48702] | committer:
David Fuhrmann
macosx: fix crash in str_format_meta
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e823a595a8aa041de17e23d8f84bcb90d5d48702
---
modules/gui/macosx/CoreInteraction.m | 12 +++-
modules/gui/macosx/MainWindow.m | 12 +++-
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/modules/gui/macosx/CoreInteraction.m
b/modules/gui/macosx/CoreInteraction.m
index 5d13a5f..a9a7c76 100644
--- a/modules/gui/macosx/CoreInteraction.m
+++ b/modules/gui/macosx/CoreInteraction.m
@@ -248,12 +248,14 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
return nil;
}
-NSString *o_name;
+NSString *o_name = @;
char *format = var_InheritString(VLCIntf, input-title-format);
-char *formated = str_format_meta(p_input, format);
-free(format);
-o_name = [NSString stringWithUTF8String:formated];
-free(formated);
+if (format) {
+char *formated = str_format_meta(p_input, format);
+free(format);
+o_name = toNSStr(formated);
+free(formated);
+}
NSURL * o_url = [NSURL URLWithString:[NSString
stringWithUTF8String:psz_uri]];
free(psz_uri);
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 94a2301..6655857 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -695,14 +695,16 @@ static VLCMainWindow *_o_sharedInstance = nil;
input_thread_t * p_input;
p_input = pl_CurrentInput(VLCIntf);
if (p_input) {
-NSString *aString;
+NSString *aString = @;
if (!config_GetPsz(VLCIntf, video-title)) {
char *format = var_InheritString(VLCIntf, input-title-format);
-char *formated = str_format_meta(p_input, format);
-free(format);
-aString = [NSString stringWithUTF8String:formated];
-free(formated);
+if (format) {
+char *formated = str_format_meta(p_input, format);
+free(format);
+aString = toNSStr(formated);
+free(formated);
+}
} else
aString = [NSString stringWithUTF8String:config_GetPsz(VLCIntf,
video-title)];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
