Changeset 1262 for trunk

Timestamp:

06/06/10 07:37:19 (2 years ago)

Author:

lechium

Message:

added initial MPlayer support, doesn't currently support custom arguments or control maps, but it's a start

Location:

trunk/CommonMediaPlayer

Files:

• Classes/CMPDefines.h (modified) (1 diff)
• Classes/CMPPlayerManager.m (modified) (2 diffs)
• Classes/CMPTypesDefines.h (modified) (1 diff)
• CommonMediaPlayer.xcodeproj/project.pbxproj (modified) (8 diffs)
• Media Players/MPlayer classes (added)
• Media Players/MPlayer classes/CMPMPPlayer.h (added)
• Media Players/MPlayer classes/CMPMPPlayer.m (added)
• Media Players/MPlayer classes/CMPMPPlayerController.h (added)
• Media Players/MPlayer classes/CMPMPPlayerController.m (added)
• bin/mplayer (added)

trunk/CommonMediaPlayer/Classes/CMPDefines.h

@@ -22 +22 @@
 //Note, only defines should ever be in this file!
 
-#define CMPVersion 8  //Full Version Number
-#define CMPAPIVersion 1 //API version 1
+#define CMPVersion 9  //Full Version Number
+#define CMPAPIVersion 2 //API version 2

trunk/CommonMediaPlayer/Classes/CMPPlayerManager.m

@@ -29 +29 @@
 #import "CMPDVDImporter.h"
 #import "CMPInstaller.h"
+#import "CMPMPPlayer.h"
+#import "CMPMPPlayerController.h"
 
 @implementation CMPPlayerManager
@@ -82 +84 @@
         [self registerPlayer:[CMPDVDImporter class] forType:CMPPlayerManagerFileTypeDVDImport withExtensions:[NSArray arrayWithObject:@""]];
         
-        
+        [self registerPlayer:[CMPMPPlayer class] forType:CMPPlayerManagerFileTypeMPlayer withExtensions:[NSArray arrayWithObjects:@"m4v", @"3gp", @"m3u", @"pls", @"divx", @"xvid", @"avi", @"mov", @"wmv", @"asx", @"asf", @"ogm", @"mpg", @"mpeg", @"mkv", @"avc", @"flv", @"dv", @"fli", @"m2v", @"ts", @"vob", @"iso", @"img", @"rm", @"rmvb", nil]];
+
+        [knownControllers addObject:[CMPMPPlayerController class]];
         return self;
 }

trunk/CommonMediaPlayer/Classes/CMPTypesDefines.h

@@ -28 +28 @@
         CMPPlayerManagerFileTypeAudio = 3,
         CMPPlayerManagerFileTypeDVDImport = 4,
+        CMPPlayerManagerFileTypeMPlayer = 5,
         CMPPlayerManagerFileTypeOther = 0xFFFF,
 } CMPPlayerManagerFileType;

trunk/CommonMediaPlayer/CommonMediaPlayer.xcodeproj/project.pbxproj

@@ -18 +18 @@
                 8768EC49112A5E4200318F1A /* AGProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 8768EC47112A5E4200318F1A /* AGProcess.h */; };
                 8768EC4A112A5E4200318F1A /* AGProcess.m in Sources */ = {isa = PBXBuildFile; fileRef = 8768EC48112A5E4200318F1A /* AGProcess.m */; };
+                87C75D8411BB51AE00D53B37 /* CMPMPPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 87C75D8011BB51AE00D53B37 /* CMPMPPlayer.h */; };
+                87C75D8511BB51AE00D53B37 /* CMPMPPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 87C75D8111BB51AE00D53B37 /* CMPMPPlayer.m */; };
+                87C75D8611BB51AE00D53B37 /* CMPMPPlayerController.h in Headers */ = {isa = PBXBuildFile; fileRef = 87C75D8211BB51AE00D53B37 /* CMPMPPlayerController.h */; };
+                87C75D8711BB51AE00D53B37 /* CMPMPPlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 87C75D8311BB51AE00D53B37 /* CMPMPPlayerController.m */; };
                 87E0033E11263CBF004FC2C7 /* CMPDVDImageAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 87E0033C11263CBF004FC2C7 /* CMPDVDImageAction.h */; };
                 87E0033F11263CBF004FC2C7 /* CMPDVDImageAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 87E0033D11263CBF004FC2C7 /* CMPDVDImageAction.m */; };
@@ -85 +89 @@
                 8768EC47112A5E4200318F1A /* AGProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AGProcess.h; sourceTree = "<group>"; };
                 8768EC48112A5E4200318F1A /* AGProcess.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AGProcess.m; sourceTree = "<group>"; };
+                87C75D8011BB51AE00D53B37 /* CMPMPPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMPMPPlayer.h; sourceTree = "<group>"; };
+                87C75D8111BB51AE00D53B37 /* CMPMPPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMPMPPlayer.m; sourceTree = "<group>"; };
+                87C75D8211BB51AE00D53B37 /* CMPMPPlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMPMPPlayerController.h; sourceTree = "<group>"; };
+                87C75D8311BB51AE00D53B37 /* CMPMPPlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMPMPPlayerController.m; sourceTree = "<group>"; };
                 87E0033C11263CBF004FC2C7 /* CMPDVDImageAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMPDVDImageAction.h; sourceTree = "<group>"; };
                 87E0033D11263CBF004FC2C7 /* CMPDVDImageAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMPDVDImageAction.m; sourceTree = "<group>"; };
@@ -167 +175 @@
                                 32C88DFF0371C24200C91783 /* Other Sources */,
                                 089C1665FE841158C02AAC07 /* Resources */,
-                                0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
                                 034768DFFF38A50411DB9C8B /* Products */,
                         );
@@ -185 +192 @@
                         isa = PBXGroup;
                         children = (
+                                0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
                                 87E006C01127A05F004FC2C7 /* bin */,
                                 8DC2EF5A0486A6940098B216 /* Info.plist */,
@@ -250 +258 @@
                         sourceTree = "<group>";
                 };
+                87C75D7F11BB51AE00D53B37 /* MPlayer classes */ = {
+                        isa = PBXGroup;
+                        children = (
+                                87C75D8011BB51AE00D53B37 /* CMPMPPlayer.h */,
+                                87C75D8111BB51AE00D53B37 /* CMPMPPlayer.m */,
+                                87C75D8211BB51AE00D53B37 /* CMPMPPlayerController.h */,
+                                87C75D8311BB51AE00D53B37 /* CMPMPPlayerController.m */,
+                        );
+                        path = "MPlayer classes";
+                        sourceTree = "<group>";
+                };
                 F50027201123573A001B52FE /* Debug */ = {
                         isa = PBXGroup;
@@ -271 +290 @@
                         isa = PBXGroup;
                         children = (
+                                87C75D7F11BB51AE00D53B37 /* MPlayer classes */,
                                 F531CAE0111E2EDF005DF910 /* Leopard DVD Framework */,
                                 F50CCCF41118ED0000213966 /* DVD Framework */,
@@ -352 +372 @@
                                 870D75EA1137AB8B007BD611 /* CMPInstaller.h in Headers */,
                                 870D75EC1137AB8B007BD611 /* CMPProgressBarControl.h in Headers */,
+                                87C75D8411BB51AE00D53B37 /* CMPMPPlayer.h in Headers */,
+                                87C75D8611BB51AE00D53B37 /* CMPMPPlayerController.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -465 +487 @@
                                 870D75EB1137AB8B007BD611 /* CMPInstaller.m in Sources */,
                                 870D75ED1137AB8B007BD611 /* CMPProgressBarControl.m in Sources */,
+                                87C75D8511BB51AE00D53B37 /* CMPMPPlayer.m in Sources */,
+                                87C75D8711BB51AE00D53B37 /* CMPMPPlayerController.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;