Skip to content

V
vlc-2-2
Commit 77271be3 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

osx dialog provider: make sure we can actually quit VLC

parent 7a992258
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 77271be3
...@@ -369,6 +369,8 @@ ...@@ -369,6 +369,8 @@
CC6D8D9D0A878DED006F2BBE /* AppleRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppleRemote.m; path = ../../../modules/gui/macosx/AppleRemote.m; sourceTree = SOURCE_ROOT; }; CC6D8D9D0A878DED006F2BBE /* AppleRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppleRemote.m; path = ../../../modules/gui/macosx/AppleRemote.m; sourceTree = SOURCE_ROOT; };
CC6EDD4F0B9CA2140096068A /* eyetv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = eyetv.h; path = ../../../modules/gui/macosx/eyetv.h; sourceTree = SOURCE_ROOT; }; CC6EDD4F0B9CA2140096068A /* eyetv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = eyetv.h; path = ../../../modules/gui/macosx/eyetv.h; sourceTree = SOURCE_ROOT; };
CC6EDD500B9CA2140096068A /* eyetv.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = eyetv.m; path = ../../../modules/gui/macosx/eyetv.m; sourceTree = SOURCE_ROOT; }; CC6EDD500B9CA2140096068A /* eyetv.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = eyetv.m; path = ../../../modules/gui/macosx/eyetv.m; sourceTree = SOURCE_ROOT; };
CC772DAC10E621C100675C9B /* VLCProgressPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCProgressPanel.h; path = ../../../modules/gui/macosx_dialog_provider/VLCProgressPanel.h; sourceTree = SOURCE_ROOT; };
CC772DAD10E621C100675C9B /* VLCProgressPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCProgressPanel.m; path = ../../../modules/gui/macosx_dialog_provider/VLCProgressPanel.m; sourceTree = SOURCE_ROOT; };
CC8062631021F8790021EB9A /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = Resources/dsa_pub.pem; sourceTree = "<group>"; }; CC8062631021F8790021EB9A /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = Resources/dsa_pub.pem; sourceTree = "<group>"; };
CC962E2C0CC7992800A56695 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; }; CC962E2C0CC7992800A56695 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
CC965D5D0DA5880F0088F222 /* display_middle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_middle.png; path = Resources/display_middle.png; sourceTree = "<group>"; }; CC965D5D0DA5880F0088F222 /* display_middle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_middle.png; path = Resources/display_middle.png; sourceTree = "<group>"; };
...@@ -828,6 +830,8 @@ ...@@ -828,6 +830,8 @@
CCD590EF10E5B71300D39094 /* Minimal Dialog Provider */ = { CCD590EF10E5B71300D39094 /* Minimal Dialog Provider */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
CC772DAC10E621C100675C9B /* VLCProgressPanel.h */,
CC772DAD10E621C100675C9B /* VLCProgressPanel.m */,
CCD590F010E5B73200D39094 /* dialogProvider.h */, CCD590F010E5B73200D39094 /* dialogProvider.h */,
CCD590F110E5B73200D39094 /* dialogProvider.m */, CCD590F110E5B73200D39094 /* dialogProvider.m */,
CCD590F210E5B76300D39094 /* VLCLoginPanel.h */, CCD590F210E5B76300D39094 /* VLCLoginPanel.h */,
......
modules/gui/macosx_dialog_provider/dialogProvider.m
View file @ 77271be3
...@@ -94,6 +94,7 @@ int OpenIntf(vlc_object_t *p_this) ...@@ -94,6 +94,7 @@ int OpenIntf(vlc_object_t *p_this)
memset(p_intf->p_sys,0,sizeof(*p_intf->p_sys)); memset(p_intf->p_sys,0,sizeof(*p_intf->p_sys));
p_intf->b_should_run_on_first_thread = true;
p_intf->pf_run = Run; p_intf->pf_run = Run;
msg_Dbg(p_intf,"Opening Mac OS X dialog provider"); msg_Dbg(p_intf,"Opening Mac OS X dialog provider");
...@@ -122,12 +123,10 @@ static void Run( intf_thread_t *p_intf ) ...@@ -122,12 +123,10 @@ static void Run( intf_thread_t *p_intf )
/* idle */ /* idle */
while(vlc_object_alive(p_intf)) while(vlc_object_alive(p_intf))
{ msleep(INTF_IDLE_SLEEP);
sleep( 100000 );
}
/* unsubscribe from the interactive dialogues */ /* unsubscribe from the interactive dialogues */
dialog_Unregister(p_intf ); dialog_Unregister(p_intf);
var_DelCallback(p_intf,"dialog-error",DisplayError,p_intf); var_DelCallback(p_intf,"dialog-error",DisplayError,p_intf);
var_DelCallback(p_intf,"dialog-critical",DisplayCritical,p_intf); var_DelCallback(p_intf,"dialog-critical",DisplayCritical,p_intf);
var_DelCallback(p_intf,"dialog-login",DisplayLogin,p_intf); var_DelCallback(p_intf,"dialog-login",DisplayLogin,p_intf);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment