summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--osdep/macosx_application.m21
-rw-r--r--video/out/osx_common.c (renamed from video/out/osx_common.m)21
-rw-r--r--video/out/osx_common.h3
4 files changed, 22 insertions, 25 deletions
diff --git a/Makefile b/Makefile
index 1662f6f1e1..1c6da641f1 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ SOURCES-$(LIBPOSTPROC) += video/filter/vf_pp.c
SOURCES-$(LIBSMBCLIENT) += stream/stream_smb.c
SOURCES-$(MACOSX_BUNDLE) += osdep/macosx_bundle.m
-SOURCES-$(COCOA) += video/out/osx_common.m \
+SOURCES-$(COCOA) += video/out/osx_common.c \
video/out/cocoa_common.m \
osdep/macosx_application.m
SOURCES-$(MNG) += demux/demux_mng.c
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m
index e57b6545b0..6d2d5e03e2 100644
--- a/osdep/macosx_application.m
+++ b/osdep/macosx_application.m
@@ -59,6 +59,27 @@ static pthread_t playback_thread_id;
@synthesize keyFIFO = _key_fifo;
@synthesize menuItems = _menu_items;
+struct escape_couple {
+ NSString *in;
+ NSString *out;
+};
+
+static struct escape_couple escapes[] = {
+ { @"\\", @"\\\\" },
+ { @"\"", @"\\\"" },
+ { NULL, NULL }
+};
+
+static NSString *escape_loadfile_name(NSString *input)
+{
+ for (int i = 0; escapes[i].out; i++) {
+ input = [input stringByReplacingOccurrencesOfString:escapes[i].in
+ withString:escapes[i].out];
+ }
+
+ return input;
+}
+
- (id)init
{
if (self = [super init]) {
diff --git a/video/out/osx_common.m b/video/out/osx_common.c
index 5b5e4fbd8f..0221501a5d 100644
--- a/video/out/osx_common.m
+++ b/video/out/osx_common.c
@@ -114,24 +114,3 @@ int convert_key(unsigned key, unsigned charcode)
return mpkey;
return charcode;
}
-
-struct escape_couple {
- NSString *in;
- NSString *out;
-};
-
-static struct escape_couple escapes[] = {
- { @"\\", @"\\\\" },
- { @"\"", @"\\\"" },
- { NULL, NULL }
-};
-
-NSString *escape_loadfile_name(NSString *input)
-{
- for (int i = 0; escapes[i].out; i++) {
- input = [input stringByReplacingOccurrencesOfString:escapes[i].in
- withString:escapes[i].out];
- }
-
- return input;
-}
diff --git a/video/out/osx_common.h b/video/out/osx_common.h
index 32bba12d21..3c4855fde3 100644
--- a/video/out/osx_common.h
+++ b/video/out/osx_common.h
@@ -19,9 +19,6 @@
#ifndef MPLAYER_OSX_COMMON_H
#define MPLAYER_OSX_COMMON_H
-struct vo;
-
int convert_key(unsigned key, unsigned charcode);
-NSString *escape_loadfile_name(NSString *input);
#endif /* MPLAYER_OSX_COMMON_H */