[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
