mirror of https://github.com/mpv-player/mpv
macosx_finder_args: use cocoa instead of carbon
macosx_finder_args was using Carbon and wasn't usable any longer on modern versions of MacOSX. This is very useful to embed mplayer in a mac application bundle. When using application bundles, the operating system will call the main function with only one argument that identifies the process serial number (this is some additional process identifier in osx other than the pid). File open events are then dispatched to the application through events that must be handled accordingly.
This commit is contained in:
Stefano Pigozzi
Uoti Urpala
parent
98d399e2f3
commit
24e08eb5f2
4
Makefile
4
Makefile
|
|
@ -99,7 +99,7 @@ SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c
|
|||
SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \
|
||||
libmpdemux/demux_rtp_codec.cpp \
|
||||
stream/stream_live555.c
|
||||
SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.c
|
||||
SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.m
|
||||
SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c
|
||||
SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c
|
||||
|
||||
|
|
@ -524,7 +524,7 @@ OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o
|
|||
OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
|
||||
|
||||
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
|
||||
DEP_FILES = $(patsubst %.S,%.d,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d))))
|
||||
DEP_FILES = $(patsubst %.S,%.d,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON:.m=.d) $(SRCS_MPLAYER:.m=.d))))
|
||||
|
||||
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
|
||||
|
||||
|
|
|
|||
|
|
@ -3579,7 +3579,7 @@ echocheck "Mac OS X Finder Support"
|
|||
def_macosx_finder='#undef CONFIG_MACOSX_FINDER'
|
||||
if test "$_macosx_finder" = yes ; then
|
||||
def_macosx_finder='#define CONFIG_MACOSX_FINDER 1'
|
||||
extra_ldflags="$extra_ldflags -framework Carbon"
|
||||
extra_ldflags="$extra_ldflags -framework Cocoa"
|
||||
fi
|
||||
echores "$_macosx_finder"
|
||||
|
||||
|
|
@ -3588,7 +3588,6 @@ def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE'
|
|||
test "$_macosx_bundle" = auto && _macosx_bundle=$_macosx_finder
|
||||
if test "$_macosx_bundle" = yes ; then
|
||||
def_macosx_bundle='#define CONFIG_MACOSX_BUNDLE 1'
|
||||
extra_ldflags="$extra_ldflags -framework Carbon"
|
||||
fi
|
||||
echores "$_macosx_bundle"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,128 +0,0 @@
|
|||
/*
|
||||
* This file is part of MPlayer.
|
||||
*
|
||||
* MPlayer is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* MPlayer is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include <Carbon/Carbon.h>
|
||||
#include <ApplicationServices/ApplicationServices.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "stream/url.h"
|
||||
#include "mp_msg.h"
|
||||
#include "m_option.h"
|
||||
#include "m_config.h"
|
||||
#include "playtree.h"
|
||||
#include "macosx_finder_args.h"
|
||||
|
||||
static play_tree_t *files=NULL;
|
||||
|
||||
static inline void add_entry(play_tree_t **last_parentp, play_tree_t **last_entryp, play_tree_t *entry) {
|
||||
|
||||
if(*last_entryp==NULL)
|
||||
play_tree_set_child(*last_parentp, entry);
|
||||
else
|
||||
play_tree_append_entry(*last_entryp, entry);
|
||||
|
||||
*last_entryp=entry;
|
||||
}
|
||||
|
||||
static pascal OSErr AppleEventHandlerProc(const AppleEvent *theAppleEvent, AppleEvent* reply, SInt32 handlerRefcon) {
|
||||
OSErr err=errAEEventNotHandled, res=noErr;
|
||||
AEDescList docList;
|
||||
long itemsInList;
|
||||
|
||||
AERemoveEventHandler(kCoreEventClass, kAEOpenDocuments, NULL, FALSE);
|
||||
if((res=AEGetParamDesc(theAppleEvent, keyDirectObject, typeAEList, &docList))==noErr) {
|
||||
if((res=AECountItems(&docList, &itemsInList))==noErr) {
|
||||
Size currentSize=0;
|
||||
int valid=0,i;
|
||||
char *parm=NULL;
|
||||
play_tree_t *last_entry=NULL;
|
||||
|
||||
files=play_tree_new();
|
||||
for(i=1;i<=itemsInList;++i) {
|
||||
|
||||
for(;;) {
|
||||
OSErr e;
|
||||
Size actualSize=0;
|
||||
AEKeyword keywd;
|
||||
DescType returnedType;
|
||||
|
||||
if((e=AEGetNthPtr(&docList, i, typeFileURL, &keywd, &returnedType, (Ptr)parm, currentSize, &actualSize))==noErr) {
|
||||
if(actualSize>=currentSize) {
|
||||
currentSize=actualSize+1;
|
||||
parm=realloc(parm, currentSize);
|
||||
}
|
||||
else {
|
||||
parm[actualSize]=0;
|
||||
valid=1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else {
|
||||
valid=0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(valid) {
|
||||
URL_t *url=url_new(parm);
|
||||
|
||||
if(url && !strcmp(url->protocol,"file") && !strcmp(url->hostname,"localhost")) {
|
||||
play_tree_t *entry=play_tree_new();
|
||||
|
||||
url_unescape_string(url->file, url->file);
|
||||
play_tree_add_file(entry, url->file);
|
||||
add_entry(&files, &last_entry, entry);
|
||||
}
|
||||
|
||||
url_free(url);
|
||||
}
|
||||
}
|
||||
|
||||
free(parm);
|
||||
|
||||
err=noErr;
|
||||
}
|
||||
else
|
||||
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "AECountItems() error %d\n", res);
|
||||
|
||||
AEDisposeDesc(&docList);
|
||||
}
|
||||
else
|
||||
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "AEGetParamDesc() error %d\n", res);
|
||||
|
||||
QuitApplicationEventLoop();
|
||||
return err;
|
||||
}
|
||||
|
||||
play_tree_t *macosx_finder_args(m_config_t *config, int argc, char **argv) {
|
||||
ProcessSerialNumber myPsn;
|
||||
char myPsnStr[5+10+1+10+1];
|
||||
|
||||
GetCurrentProcess(&myPsn);
|
||||
snprintf(myPsnStr, 5+10+1+10+1, "-psn_%u_%u", myPsn.highLongOfPSN, myPsn.lowLongOfPSN);
|
||||
myPsnStr[5+10+1+10]=0;
|
||||
|
||||
if((argc==2) && !strcmp(myPsnStr, argv[1])) {
|
||||
m_config_set_option0(config, "quiet", NULL, false);
|
||||
InitCursor();
|
||||
AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, NewAEEventHandlerUPP(AppleEventHandlerProc), 0, FALSE);
|
||||
RunApplicationEventLoop();
|
||||
}
|
||||
|
||||
return files;
|
||||
}
|
||||
|
|
@ -1,18 +1,18 @@
|
|||
/*
|
||||
* This file is part of MPlayer.
|
||||
* This file is part of mplayer2.
|
||||
*
|
||||
* MPlayer is free software; you can redistribute it and/or modify
|
||||
* mplayer2 is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* MPlayer is distributed in the hope that it will be useful,
|
||||
* mplayer2 is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
||||
* with mplayer2; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,83 @@
|
|||
/*
|
||||
* This file is part of mplayer2.
|
||||
*
|
||||
* mplayer2 is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* mplayer2 is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with mplayer2; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
#import <ApplicationServices/ApplicationServices.h>
|
||||
#include <stdio.h>
|
||||
#include "macosx_finder_args.h"
|
||||
|
||||
static play_tree_t *files = NULL;
|
||||
|
||||
void macosx_wait_fileopen_events(void);
|
||||
bool psn_matches_current_process(char *psn_arg_to_check);
|
||||
|
||||
@interface FileOpenDelegate : NSObject
|
||||
- (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames;
|
||||
@end
|
||||
|
||||
@implementation FileOpenDelegate
|
||||
- (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames
|
||||
{
|
||||
files = play_tree_new();
|
||||
play_tree_t *last_entry = nil;
|
||||
for (NSString *filename in filenames) {
|
||||
play_tree_t *entry = play_tree_new();
|
||||
play_tree_add_file(entry, [filename UTF8String]);
|
||||
|
||||
if (last_entry)
|
||||
play_tree_append_entry(files, entry);
|
||||
else
|
||||
play_tree_set_child(files, entry);
|
||||
|
||||
last_entry = entry;
|
||||
}
|
||||
[NSApp stop:nil]; // stop the runloop (give back control to mplayer2 code)
|
||||
}
|
||||
@end
|
||||
|
||||
void macosx_wait_fileopen_events()
|
||||
{
|
||||
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
||||
NSApp = [NSApplication sharedApplication];
|
||||
[NSApp setDelegate: [[[FileOpenDelegate alloc] init] autorelease]];
|
||||
[NSApp run]; // block until we recive the fileopen events
|
||||
[pool release];
|
||||
}
|
||||
|
||||
bool psn_matches_current_process(char *psn_arg_to_check)
|
||||
{
|
||||
ProcessSerialNumber psn;
|
||||
char psn_arg[5+10+1+10+1];
|
||||
|
||||
GetCurrentProcess(&psn);
|
||||
snprintf(psn_arg, 5+10+1+10+1, "-psn_%u_%u",
|
||||
psn.highLongOfPSN, psn.lowLongOfPSN);
|
||||
psn_arg[5+10+1+10]=0;
|
||||
|
||||
return strcmp(psn_arg, psn_arg_to_check) == 0;
|
||||
}
|
||||
|
||||
play_tree_t *macosx_finder_args(m_config_t *config, int argc, char **argv)
|
||||
{
|
||||
if (argc==2 && psn_matches_current_process(argv[1])) {
|
||||
m_config_set_option0(config, "quiet", NULL, false);
|
||||
macosx_wait_fileopen_events();
|
||||
}
|
||||
|
||||
return files;
|
||||
}
|
||||
Loading…
Reference in New Issue