Merge remote-tracking branch 'origin/master'

Conflicts:
	bstr.c
	bstr.h
	etc/input.conf
	input/input.c
	input/input.h
	libao2/ao_pulse.c
	libmpcodecs/vf_ass.c
	libmpcodecs/vf_vo.c
	libvo/gl_common.c
	libvo/x11_common.c
	mixer.c
	mixer.h
	mplayer.c

3 files changed, 99 insertions, 132 deletions

diff --git a/osdep/macosx_finder_args.c b/osdep/macosx_finder_args.c
deleted file mode 100644
index 6b5ef321f4..0000000000
--- a/osdep/macosx_finder_args.c
+++ /dev/null
@@ -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;
-}
diff --git a/osdep/macosx_finder_args.h b/osdep/macosx_finder_args.h
index 4f06a139a6..1f18931712 100644
--- a/osdep/macosx_finder_args.h
+++ b/osdep/macosx_finder_args.h
@@ -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.
  */
 
diff --git a/osdep/macosx_finder_args.m b/osdep/macosx_finder_args.m
new file mode 100644
index 0000000000..b006f11a79
--- /dev/null
+++ b/osdep/macosx_finder_args.m
@@ -0,0 +1,95 @@
+/*
+ * 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);
+void macosx_redirect_output_to_logfile(const char *filename);
+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];
+}
+
+void macosx_redirect_output_to_logfile(const char *filename)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSString *log_path = [NSHomeDirectory() stringByAppendingPathComponent:
+        [@"Library/Logs/" stringByAppendingFormat:@"%s.log", filename]];
+    freopen([log_path fileSystemRepresentation], "a", stdout);
+    freopen([log_path fileSystemRepresentation], "a", stderr);
+    [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])) {
+        macosx_redirect_output_to_logfile("mplayer2");
+        m_config_set_option0(config, "quiet", NULL, false);
+        macosx_wait_fileopen_events();
+    }
+
+    return files;
+}