[mplayerosx-devel] [mplayerosx]: r158 - in trunk: MPlayer OSX.pbproj MPlayer OSX.xcodeproj/project.pbxproj Makefile Makefile.old Resources/English.lproj/MainMenu.nib/classes.nib Resources/English.lproj/MainMenu.nib/i...
nplourde
subversion at mplayerhq.hu
Fri Apr 24 12:19:02 CEST 2009
Author: nplourde
Date: Fri Apr 24 12:19:01 2009
New Revision: 158
Log:
removed old project files and makefile
Deleted:
trunk/MPlayer OSX.pbproj/
trunk/Makefile
trunk/Makefile.old
Modified:
trunk/MPlayer OSX.xcodeproj/project.pbxproj
trunk/Resources/English.lproj/MainMenu.nib/classes.nib
trunk/Resources/English.lproj/MainMenu.nib/info.nib
trunk/Sources/Classes/VideoOpenGLView.h
trunk/Sources/Classes/VideoOpenGLView.m
trunk/Sources/Controllers/AppController.m
trunk/TODO
Modified: trunk/MPlayer OSX.xcodeproj/project.pbxproj
==============================================================================
--- trunk/MPlayer OSX.xcodeproj/project.pbxproj Mon May 12 01:54:37 2008 (r157)
+++ trunk/MPlayer OSX.xcodeproj/project.pbxproj Fri Apr 24 12:19:01 2009 (r158)
@@ -7,43 +7,12 @@
objects = {
/* Begin PBXAggregateTarget section */
- 37B4F8290CDF359D00941094 /* Build MPlayer PPC noaltivec */ = {
- isa = PBXAggregateTarget;
- buildConfigurationList = 37B4F82B0CDF359D00941094 /* Build configuration list for PBXAggregateTarget "Build MPlayer PPC noaltivec" */;
- buildPhases = (
- 37B4F82A0CDF359D00941094 /* ShellScript */,
- );
- dependencies = (
- );
- name = "Build MPlayer PPC noaltivec";
- productName = "Build MPlayer PPC";
- };
- 37B9DF1A0C2E923700211F5E /* Build MPlayer PPC */ = {
- isa = PBXAggregateTarget;
- buildConfigurationList = 37B9DF1B0C2E925600211F5E /* Build configuration list for PBXAggregateTarget "Build MPlayer PPC" */;
- buildPhases = (
- 37B9DF220C2E929100211F5E /* ShellScript */,
- );
- dependencies = (
- );
- name = "Build MPlayer PPC";
- productName = "Build MPlayer PPC";
- };
- 37B9DF1E0C2E926D00211F5E /* Build MPlayer Intel */ = {
- isa = PBXAggregateTarget;
- buildConfigurationList = 37B9DF1F0C2E928000211F5E /* Build configuration list for PBXAggregateTarget "Build MPlayer Intel" */;
- buildPhases = (
- 37B9DF240C2E92A300211F5E /* ShellScript */,
- );
- dependencies = (
- );
- name = "Build MPlayer Intel";
- productName = "Build MPlayer Intel";
- };
37B9DF260C2E93F800211F5E /* Build MPlayer Universal */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 37B9DF270C2E941700211F5E /* Build configuration list for PBXAggregateTarget "Build MPlayer Universal" */;
buildPhases = (
+ 37138C5B0D7B053C00795922 /* ShellScript */,
+ 37138C590D7B053300795922 /* ShellScript */,
37BFD4150CCD659900FCABD6 /* ShellScript */,
);
dependencies = (
@@ -119,7 +88,7 @@
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Sources/main.m; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* MPlayer OSX_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "MPlayer OSX_Prefix.pch"; path = "Sources/MPlayer OSX_Prefix.pch"; sourceTree = "<group>"; };
- 371875E50B2307130096E1ED /* MPlayer OSX PPC-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = "MPlayer OSX PPC-Info.plist"; path = "Resources/MPlayer OSX PPC-Info.plist"; sourceTree = "<group>"; };
+ 371875E50B2307130096E1ED /* MPlayer OSX PPC-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "MPlayer OSX PPC-Info.plist"; path = "Resources/MPlayer OSX PPC-Info.plist"; sourceTree = "<group>"; };
371878190B230ABD0096E1ED /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
372E8224086A431900FC39B4 /* PlayListController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PlayListController.h; path = Sources/Controllers/PlayListController.h; sourceTree = "<group>"; };
372E8225086A431900FC39B4 /* PlayListController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PlayListController.m; path = Sources/Controllers/PlayListController.m; sourceTree = "<group>"; };
@@ -189,7 +158,7 @@
37EA4AB5086218D50026216A /* volumeKnobOff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumeKnobOff.png; path = Resources/Graphics/volumeKnobOff.png; sourceTree = "<group>"; };
37EA4ABD086220520026216A /* volumeKnobOn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumeKnobOn.png; path = Resources/Graphics/volumeKnobOn.png; sourceTree = "<group>"; };
37EA4BC1086271480026216A /* scrub_bar_anim.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = scrub_bar_anim.png; path = Resources/Graphics/scrub_bar_anim.png; sourceTree = "<group>"; };
- 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = Info.plist; path = Resources/Info.plist; sourceTree = "<group>"; };
+ 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Resources/Info.plist; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* MPlayer OSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "MPlayer OSX.app"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@@ -397,10 +366,7 @@
projectRoot = "";
targets = (
8D1107260486CEB800E47090 /* MPlayer OSX */,
- 37B9DF1A0C2E923700211F5E /* Build MPlayer PPC */,
- 37B9DF1E0C2E926D00211F5E /* Build MPlayer Intel */,
37B9DF260C2E93F800211F5E /* Build MPlayer Universal */,
- 37B4F8290CDF359D00941094 /* Build MPlayer PPC noaltivec */,
);
};
/* End PBXProject section */
@@ -457,20 +423,7 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
- 37B4F82A0CDF359D00941094 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "setenv BUILD_ARCH=build/mplayer_ppc\nsetenv NEXT_ROOT=/Developer/SDKs/MacOSX10.4u.sdk\nsetenv MACOSX_DEPLOYMENT_TARGET=10.4\nsetenv CFLAGS=\"-mmacosx-version-min=10.4 -isystem /Developer/SDKs/MacOSX10.4u.sdk -I/usr/local/include\"\nsetenv LDFLAGS=\"-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -L/usr/local/lib\"\ncd mplayer\n./configure --enable-cross-compile --cc=\"cc -arch ppc\" --host-cc=\"cc -arch i386\" --target=ppc-darwin --disable-win32dll --disable-altivec --with-extraincdir=/usr/local/include --with-extralibdir=/usr/local/lib\nmake clean\nmake\nmv mplayer ../External_Binaries/mplayer_noaltivec.app/Contents/MacOS/mplayer\ncd ..\nexit 0";
- };
- 37B9DF220C2E929100211F5E /* ShellScript */ = {
+ 37138C590D7B053300795922 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -481,9 +434,9 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "export NEXT_ROOT=/Developer/SDKs/MacOSX10.4u.sdk\nexport MACOSX_DEPLOYMENT_TARGET=10.4\nexport CFLAGS=\"-mmacosx-version-min=10.4 -isystem /Developer/SDKs/MacOSX10.4u.sdk -I/Users/nicolas/Source/MPlayer/usr/local/ppc/include\"\nexport LDFLAGS=\"-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -L/Users/nicolas/Source/MPlayer/usr/local/ppc/lib -lxml2\"\nexport CXXFLAGS=\"-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -I/Users/nicolas/Source/MPlayer/usr/local/ppc/include -L/Users/nicolas/Source/MPlayer/usr/local/ppc/lib -arch ppc\"\nexport FREETYPE_CFLAGS=\"-I/Users/nicolas/Source/MPlayer/usr/local/ppc/include/freetype2\"\nexport FREETYPE_LIBS=\"-L/Users/nicolas/Source/MPlayer/usr/local/ppc/lib -lfreetype\"\n--with-expat-lib=/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/lib/\ncd mplayer\nCC=\"gcc -arch ppc\" ./configure --disable-shared --host=powerpc-apple-darwin9.1.0 --build=powerpc-apple-darwin9.1.0 --with-expat-lib=/Deve
loper/SDKs/MacOSX10.4u.sdk/usr/X11R6/lib/ --prefix=/Users/nicolas/Source/MPlayer/usr/local/ppc\n\n./configure --enable-cross-compile --cc=\"cc -arch ppc\" --host-cc=\"cc -arch i386\" --target=ppc-darwin --disable-win32dll --enable-altivec\nmake clean\nmake\nmv mplayer ./mplayer_ppc\ncd ..\nexit 0";
+ shellScript = "export NEXT_ROOT=/Developer/SDKs/MacOSX10.4u.sdk\nexport MACOSX_DEPLOYMENT_TARGET=10.4\nexport CFLAGS=\"-mmacosx-version-min=10.4 -isystem /Developer/SDKs/MacOSX10.4u.sdk -I/Users/nicolas/Source/MPlayer/usr/local/i386/include\"\nexport LDFLAGS=\"-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -L/Users/nicolas/Source/MPlayer/usr/local/i386/lib\"\nexport CXXFLAGS=\"-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -I/Users/nicolas/Source/MPlayer/usr/local/i386/include -L/Users/nicolas/Source/MPlayer/usr/local/i386/lib\"\nexport FREETYPE_CFLAGS=\"-I/Users/nicolas/Source/MPlayer/usr/local/i386/include/freetype2\"\nexport FREETYPE_LIBS=\"-L/Users/nicolas/Source/MPlayer/usr/local/i386/lib -lfreetype\"\nexport LIBXML2_CFLAGS=\"-I/Users/nicolas/Source/MPlayer/usr/local/i386/include/libxml2\"\nexport LIBXML2_CFLAGS=\"-I/Users/nicolas/Source/MPlayer/usr/local/i386/include/libxml2\"\n\ncd mplayer\n./configure --disable-shared --pr
efix=/Users/nicolas/Source/MPlayer/usr/local/i386\n\n./configure\nmake clean\nmake\nmv mplayer ./mplayer_i386\ncd ..\nexit 0";
};
- 37B9DF240C2E92A300211F5E /* ShellScript */ = {
+ 37138C5B0D7B053C00795922 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -494,7 +447,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "export NEXT_ROOT=/Developer/SDKs/MacOSX10.4u.sdk\nexport MACOSX_DEPLOYMENT_TARGET=10.4\nexport CFLAGS=\"-mmacosx-version-min=10.4 -isystem /Developer/SDKs/MacOSX10.4u.sdk -I/Users/nicolas/Source/MPlayer/usr/local/i386/include\"\nexport LDFLAGS=\"-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -L/Users/nicolas/Source/MPlayer/usr/local/i386/lib\"\nexport CXXFLAGS=\"-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -I/Users/nicolas/Source/MPlayer/usr/local/i386/include -L/Users/nicolas/Source/MPlayer/usr/local/i386/lib\"\nexport FREETYPE_CFLAGS=\"-I/Users/nicolas/Source/MPlayer/usr/local/i386/include/freetype2\"\nexport FREETYPE_LIBS=\"-L/Users/nicolas/Source/MPlayer/usr/local/i386/lib -lfreetype\"\nexport LIBXML2_CFLAGS=\"-I/Users/nicolas/Source/MPlayer/usr/local/i386/include/libxml2\"\nexport LIBXML2_CFLAGS=\"-I/Users/nicolas/Source/MPlayer/usr/local/i386/include/libxml2\"\n\ncd mplayer\n./configure --disable-shared --pr
efix=/Users/nicolas/Source/MPlayer/usr/local/i386\n\n./configure\nmake clean\nmake\nmv mplayer ./mplayer_i386\ncd ..\nexit 0";
+ shellScript = "export NEXT_ROOT=/Developer/SDKs/MacOSX10.4u.sdk\nexport MACOSX_DEPLOYMENT_TARGET=10.4\nexport CFLAGS=\"-ftree-vectorize -mmacosx-version-min=10.4 -isystem /Developer/SDKs/MacOSX10.4u.sdk -I/Users/nicolas/Source/MPlayer/usr/local/ppc/include\"\nexport LDFLAGS=\"-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -L/Users/nicolas/Source/MPlayer/usr/local/ppc/lib -lxml2\"\nexport CXXFLAGS=\"-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -I/Users/nicolas/Source/MPlayer/usr/local/ppc/include -L/Users/nicolas/Source/MPlayer/usr/local/ppc/lib -arch ppc\"\nexport FREETYPE_CFLAGS=\"-I/Users/nicolas/Source/MPlayer/usr/local/ppc/include/freetype2\"\nexport FREETYPE_LIBS=\"-L/Users/nicolas/Source/MPlayer/usr/local/ppc/lib -lfreetype\"\n--with-expat-lib=/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/lib/\ncd mplayer\nCC=\"gcc -arch ppc\" ./configure --disable-shared --host=powerpc-apple-darwin9.1.0 --build=powerpc-apple-darwin9.1.0 --wit
h-expat-lib=/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/lib/ --prefix=/Users/nicolas/Source/MPlayer/usr/local/ppc\n\n./configure --enable-cross-compile --cc=\"cc -arch ppc\" --host-cc=\"cc -arch i386\" --target=ppc-darwin --disable-win32dll --enable-altivec\nmake clean\nmake\nmv mplayer ./mplayer_ppc\ncd ..\nexit 0";
};
37BFD4150CCD659900FCABD6 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -634,72 +587,6 @@
};
name = Release;
};
- 37B4F82C0CDF359D00941094 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
- PRODUCT_NAME = "Build MPlayer PPC";
- };
- name = Debug;
- };
- 37B4F82D0CDF359D00941094 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- PRODUCT_NAME = "Build MPlayer PPC";
- ZERO_LINK = NO;
- };
- name = Release;
- };
- 37B9DF1C0C2E925600211F5E /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
- PRODUCT_NAME = "Build MPlayer PPC";
- };
- name = Debug;
- };
- 37B9DF1D0C2E925600211F5E /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- PRODUCT_NAME = "Build MPlayer PPC";
- ZERO_LINK = NO;
- };
- name = Release;
- };
- 37B9DF200C2E928000211F5E /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
- PRODUCT_NAME = "Build MPlayer Intel";
- };
- name = Debug;
- };
- 37B9DF210C2E928000211F5E /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- PRODUCT_NAME = "Build MPlayer Intel";
- ZERO_LINK = NO;
- };
- name = Release;
- };
37B9DF280C2E941700211F5E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -743,33 +630,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- 37B4F82B0CDF359D00941094 /* Build configuration list for PBXAggregateTarget "Build MPlayer PPC noaltivec" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 37B4F82C0CDF359D00941094 /* Debug */,
- 37B4F82D0CDF359D00941094 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Debug;
- };
- 37B9DF1B0C2E925600211F5E /* Build configuration list for PBXAggregateTarget "Build MPlayer PPC" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 37B9DF1C0C2E925600211F5E /* Debug */,
- 37B9DF1D0C2E925600211F5E /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Debug;
- };
- 37B9DF1F0C2E928000211F5E /* Build configuration list for PBXAggregateTarget "Build MPlayer Intel" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 37B9DF200C2E928000211F5E /* Debug */,
- 37B9DF210C2E928000211F5E /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Debug;
- };
37B9DF270C2E941700211F5E /* Build configuration list for PBXAggregateTarget "Build MPlayer Universal" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Modified: trunk/Resources/English.lproj/MainMenu.nib/classes.nib
==============================================================================
--- trunk/Resources/English.lproj/MainMenu.nib/classes.nib Mon May 12 01:54:37 2008 (r157)
+++ trunk/Resources/English.lproj/MainMenu.nib/classes.nib Fri Apr 24 12:19:01 2009 (r158)
@@ -1,453 +1,229 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IBClasses</key>
- <array>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>MovieMenuAction</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>VideoOpenGLView</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>DoubleSizeMenuItem</key>
- <string>id</string>
- <key>FullAspectMenuItem</key>
- <string>id</string>
- <key>HalfSizeMenuItem</key>
- <string>id</string>
- <key>KeepAspectMenuItem</key>
- <string>id</string>
- <key>NormalSizeMenuItem</key>
- <string>id</string>
- <key>OriginalAspectMenuItem</key>
- <string>id</string>
- <key>PanScanMenuItem</key>
- <string>id</string>
- <key>WideAspectMenuItem</key>
- <string>id</string>
- <key>appController</key>
- <string>id</string>
- <key>fullscreenWindow</key>
- <string>id</string>
- <key>playListController</key>
- <string>id</string>
- <key>playerController</key>
- <string>id</string>
- <key>preferencesController</key>
- <string>id</string>
- <key>settingsController</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSOpenGLView</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>ScrubbingBar</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSProgressIndicator</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>cancelPreflight</key>
- <string>id</string>
- <key>changePlayMode</key>
- <string>id</string>
- <key>displayItemSettings</key>
- <string>id</string>
- <key>displayWindow</key>
- <string>id</string>
- <key>doubleClick</key>
- <string>id</string>
- <key>playNext</key>
- <string>id</string>
- <key>playPrevious</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>PlayListController</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>appController</key>
- <string>id</string>
- <key>filenameBox</key>
- <string>id</string>
- <key>playListButton</key>
- <string>id</string>
- <key>playListCount</key>
- <string>id</string>
- <key>playListTable</key>
- <string>id</string>
- <key>playListWindow</key>
- <string>id</string>
- <key>playModeButton</key>
- <string>id</string>
- <key>playerController</key>
- <string>id</string>
- <key>playerNextToolbarView</key>
- <string>NSView</string>
- <key>playerPlayToolbarView</key>
- <string>NSView</string>
- <key>playerPrevToolbarView</key>
- <string>NSView</string>
- <key>playerScrubToolbarView</key>
- <string>NSView</string>
- <key>playerStopToolbarView</key>
- <string>NSView</string>
- <key>playerVolumeToolbarView</key>
- <string>NSView</string>
- <key>preflightPanel</key>
- <string>id</string>
- <key>progressBar</key>
- <string>id</string>
- <key>settingsButton</key>
- <string>id</string>
- <key>settingsController</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>changeVolume</key>
- <string>id</string>
- <key>displayStats</key>
- <string>id</string>
- <key>displayWindow</key>
- <string>id</string>
- <key>playPause</key>
- <string>id</string>
- <key>seekBack</key>
- <string>id</string>
- <key>seekBegin</key>
- <string>id</string>
- <key>seekEnd</key>
- <string>id</string>
- <key>seekFwd</key>
- <string>id</string>
- <key>stop</key>
- <string>id</string>
- <key>switchFullscreen</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>PlayerController</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>appController</key>
- <string>id</string>
- <key>playButton</key>
- <string>NSButton</string>
- <key>playButtonToolbar</key>
- <string>NSButton</string>
- <key>playListButton</key>
- <string>id</string>
- <key>playListController</key>
- <string>id</string>
- <key>playerWindow</key>
- <string>id</string>
- <key>preferencesController</key>
- <string>id</string>
- <key>scrubbingBar</key>
- <string>id</string>
- <key>scrubbingBarToolbar</key>
- <string>id</string>
- <key>settingsController</key>
- <string>id</string>
- <key>statsAVsyncBox</key>
- <string>id</string>
- <key>statsCPUUsageBox</key>
- <string>id</string>
- <key>statsCacheUsageBox</key>
- <string>id</string>
- <key>statsDroppedBox</key>
- <string>id</string>
- <key>statsPanel</key>
- <string>id</string>
- <key>statsPostProcBox</key>
- <string>id</string>
- <key>statsStatusBox</key>
- <string>id</string>
- <key>timeTextField</key>
- <string>id</string>
- <key>timeTextFieldToolbar</key>
- <string>id</string>
- <key>videoOpenGLView</key>
- <string>VideoOpenGLView</string>
- <key>volumeIconImage</key>
- <string>id</string>
- <key>volumeIconImageToolbar</key>
- <string>id</string>
- <key>volumeSlider</key>
- <string>id</string>
- <key>volumeSliderToolbar</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>PlayerWindow</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>playerController</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSWindow</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>clear</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>PlaylistTableView</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>playListController</key>
- <string>PlayListController</string>
- <key>playerController</key>
- <string>PlayerController</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSTableView</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>applyPrefs</key>
- <string>id</string>
- <key>cacheSizeChanged</key>
- <string>id</string>
- <key>cancelPrefs</key>
- <string>id</string>
- <key>displayPreferences</key>
- <string>id</string>
- <key>enableControls</key>
- <string>id</string>
- <key>prefsChanged</key>
- <string>id</string>
- <key>restorePrefs</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>PreferencesController</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>Postprocesingbutton</key>
- <string>id</string>
- <key>addParamsBox</key>
- <string>id</string>
- <key>addParamsButton</key>
- <string>id</string>
- <key>appController</key>
- <string>id</string>
- <key>cacheSizeBox</key>
- <string>id</string>
- <key>cacheSizeSlider</key>
- <string>id</string>
- <key>defaultFullscreenButton</key>
- <string>id</string>
- <key>displayPlayList</key>
- <string>id</string>
- <key>dropFramesButton</key>
- <string>id</string>
- <key>enableAltivec</key>
- <string>id</string>
- <key>enableCacheButton</key>
- <string>id</string>
- <key>nosoundbutton</key>
- <string>id</string>
- <key>playListController</key>
- <string>id</string>
- <key>playerController</key>
- <string>id</string>
- <key>preferencesPanel</key>
- <string>NSPanel</string>
- <key>rememberButton</key>
- <string>id</string>
- <key>rootwinButton</key>
- <string>id</string>
- <key>secMonitorbutton</key>
- <string>id</string>
- <key>smallTextButton</key>
- <string>id</string>
- <key>subEncodingMenu</key>
- <string>id</string>
- <key>subFontMenu</key>
- <string>id</string>
- <key>subSizeMenu</key>
- <string>id</string>
- <key>tileButton</key>
- <string>id</string>
- <key>videoAspectMenu</key>
- <string>id</string>
- <key>videoDriverMenu</key>
- <string>id</string>
- <key>videoSizeMenu</key>
- <string>id</string>
- <key>videoWidthButton</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key></key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>FirstResponder</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>VolumeSlider</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSSlider</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>applySettings</key>
- <string>id</string>
- <key>cancelSettings</key>
- <string>id</string>
- <key>chooseAudio</key>
- <string>id</string>
- <key>chooseSubtitles</key>
- <string>id</string>
- <key>removeAudio</key>
- <string>id</string>
- <key>removeSubtitles</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>SettingsController</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>appController</key>
- <string>id</string>
- <key>audioBox</key>
- <string>id</string>
- <key>audioFormatBox</key>
- <string>id</string>
- <key>encodingMenu</key>
- <string>id</string>
- <key>fileFormatBox</key>
- <string>id</string>
- <key>lengthBox</key>
- <string>id</string>
- <key>movieFileBox</key>
- <string>id</string>
- <key>playListController</key>
- <string>id</string>
- <key>playerController</key>
- <string>id</string>
- <key>rebuildIndexButton</key>
- <string>id</string>
- <key>settingsPanel</key>
- <string>id</string>
- <key>subtitlesBox</key>
- <string>id</string>
- <key>titleBox</key>
- <string>id</string>
- <key>videoFormatBox</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>addToPlaylist</key>
- <string>id</string>
- <key>applyLocation</key>
- <string>id</string>
- <key>applyVIDEO_TSLocation</key>
- <string>id</string>
- <key>cancelLocation</key>
- <string>id</string>
- <key>cancelVIDEO_TSLocation</key>
- <string>id</string>
- <key>displayLogWindow</key>
- <string>id</string>
- <key>displayPlayList</key>
- <string>id</string>
- <key>donate</key>
- <string>id</string>
- <key>openFile</key>
- <string>id</string>
- <key>openLocation</key>
- <string>id</string>
- <key>openSubtitle</key>
- <string>id</string>
- <key>openVIDEO_TS</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>AppController</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>locationBox</key>
- <string>id</string>
- <key>locationPanel</key>
- <string>id</string>
- <key>playListController</key>
- <string>id</string>
- <key>playerController</key>
- <string>id</string>
- <key>theApp</key>
- <string>id</string>
- <key>video_tsBox</key>
- <string>id</string>
- <key>video_tsPanel</key>
- <string>id</string>
- <key>video_tsbutton</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- </array>
- <key>IBVersion</key>
- <string>1</string>
-</dict>
-</plist>
+{
+ IBClasses = (
+ {
+ ACTIONS = {
+ addToPlaylist = id;
+ applyLocation = id;
+ "applyVIDEO_TSLocation" = id;
+ cancelLocation = id;
+ "cancelVIDEO_TSLocation" = id;
+ displayLogWindow = id;
+ displayPlayList = id;
+ donate = id;
+ openFile = id;
+ openLocation = id;
+ openSubtitle = id;
+ "openVIDEO_TS" = id;
+ };
+ CLASS = AppController;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ locationBox = id;
+ locationPanel = id;
+ playListController = id;
+ playerController = id;
+ theApp = id;
+ "video_tsBox" = id;
+ "video_tsPanel" = id;
+ "video_tsbutton" = id;
+ };
+ SUPERCLASS = NSObject;
+ },
+ {
+ ACTIONS = {"" = id; };
+ CLASS = FirstResponder;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSObject;
+ },
+ {
+ ACTIONS = {
+ cancelPreflight = id;
+ changePlayMode = id;
+ displayItemSettings = id;
+ displayWindow = id;
+ doubleClick = id;
+ playNext = id;
+ playPrevious = id;
+ };
+ CLASS = PlayListController;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ appController = id;
+ filenameBox = id;
+ playListButton = id;
+ playListCount = id;
+ playListTable = id;
+ playListWindow = id;
+ playModeButton = id;
+ playerController = id;
+ playerNextToolbarView = NSView;
+ playerPlayToolbarView = NSView;
+ playerPrevToolbarView = NSView;
+ playerScrubToolbarView = NSView;
+ playerStopToolbarView = NSView;
+ playerVolumeToolbarView = NSView;
+ preflightPanel = id;
+ progressBar = id;
+ settingsButton = id;
+ settingsController = id;
+ };
+ SUPERCLASS = NSObject;
+ },
+ {
+ ACTIONS = {
+ changeVolume = id;
+ displayStats = id;
+ displayWindow = id;
+ playPause = id;
+ seekBack = id;
+ seekBegin = id;
+ seekEnd = id;
+ seekFwd = id;
+ stop = id;
+ switchFullscreen = id;
+ };
+ CLASS = PlayerController;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ appController = id;
+ playButton = NSButton;
+ playButtonToolbar = NSButton;
+ playListButton = id;
+ playListController = id;
+ playerWindow = id;
+ preferencesController = id;
+ scrubbingBar = id;
+ scrubbingBarToolbar = id;
+ settingsController = id;
+ statsAVsyncBox = id;
+ statsCPUUsageBox = id;
+ statsCacheUsageBox = id;
+ statsDroppedBox = id;
+ statsPanel = id;
+ statsPostProcBox = id;
+ statsStatusBox = id;
+ timeTextField = id;
+ timeTextFieldToolbar = id;
+ videoOpenGLView = VideoOpenGLView;
+ volumeIconImage = id;
+ volumeIconImageToolbar = id;
+ volumeSlider = id;
+ volumeSliderToolbar = id;
+ };
+ SUPERCLASS = NSObject;
+ },
+ {
+ CLASS = PlayerWindow;
+ LANGUAGE = ObjC;
+ OUTLETS = {playerController = id; };
+ SUPERCLASS = NSWindow;
+ },
+ {
+ ACTIONS = {clear = id; };
+ CLASS = PlaylistTableView;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ playListController = PlayListController;
+ playerController = PlayerController;
+ };
+ SUPERCLASS = NSTableView;
+ },
+ {
+ ACTIONS = {
+ applyPrefs = id;
+ cacheSizeChanged = id;
+ cancelPrefs = id;
+ displayPreferences = id;
+ enableControls = id;
+ prefsChanged = id;
+ restorePrefs = id;
+ };
+ CLASS = PreferencesController;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ Postprocesingbutton = id;
+ addParamsBox = id;
+ addParamsButton = id;
+ appController = id;
+ cacheSizeBox = id;
+ cacheSizeSlider = id;
+ defaultFullscreenButton = id;
+ displayPlayList = id;
+ dropFramesButton = id;
+ enableAltivec = id;
+ enableCacheButton = id;
+ nosoundbutton = id;
+ playListController = id;
+ playerController = id;
+ preferencesPanel = NSPanel;
+ rememberButton = id;
+ rootwinButton = id;
+ secMonitorbutton = id;
+ smallTextButton = id;
+ subEncodingMenu = id;
+ subFontMenu = id;
+ subSizeMenu = id;
+ tileButton = id;
+ videoAspectMenu = id;
+ videoDriverMenu = id;
+ videoSizeMenu = id;
+ videoWidthButton = id;
+ };
+ SUPERCLASS = NSObject;
+ },
+ {CLASS = ScrubbingBar; LANGUAGE = ObjC; SUPERCLASS = NSProgressIndicator; },
+ {
+ ACTIONS = {
+ applySettings = id;
+ cancelSettings = id;
+ chooseAudio = id;
+ chooseSubtitles = id;
+ removeAudio = id;
+ removeSubtitles = id;
+ };
+ CLASS = SettingsController;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ appController = id;
+ audioBox = id;
+ audioFormatBox = id;
+ encodingMenu = id;
+ fileFormatBox = id;
+ lengthBox = id;
+ movieFileBox = id;
+ playListController = id;
+ playerController = id;
+ rebuildIndexButton = id;
+ settingsPanel = id;
+ subtitlesBox = id;
+ titleBox = id;
+ videoFormatBox = id;
+ };
+ SUPERCLASS = NSObject;
+ },
+ {
+ ACTIONS = {MovieMenuAction = id; };
+ CLASS = VideoOpenGLView;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ DoubleSizeMenuItem = id;
+ FullAspectMenuItem = id;
+ HalfSizeMenuItem = id;
+ KeepAspectMenuItem = id;
+ NormalSizeMenuItem = id;
+ OriginalAspectMenuItem = id;
+ PanScanMenuItem = id;
+ WideAspectMenuItem = id;
+ appController = id;
+ fullscreenWindow = id;
+ playListController = id;
+ playerController = id;
+ preferencesController = id;
+ settingsController = id;
+ };
+ SUPERCLASS = NSOpenGLView;
+ },
+ {CLASS = VolumeSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; }
+ );
+ IBVersion = 1;
+}
\ No newline at end of file
Modified: trunk/Resources/English.lproj/MainMenu.nib/info.nib
==============================================================================
--- trunk/Resources/English.lproj/MainMenu.nib/info.nib Mon May 12 01:54:37 2008 (r157)
+++ trunk/Resources/English.lproj/MainMenu.nib/info.nib Fri Apr 24 12:19:01 2009 (r158)
@@ -1,19 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>IBDocumentLocation</key>
+ <string>68 104 356 240 0 0 1024 746 </string>
+ <key>IBEditorPositions</key>
+ <dict>
+ <key>29</key>
+ <string>50 604 371 44 0 0 1024 746 </string>
+ </dict>
<key>IBFramework Version</key>
- <string>629</string>
+ <string>489.0</string>
<key>IBLastKnownRelativeProjectPath</key>
<string>../../../MPlayer OSX.xcodeproj</string>
<key>IBOldestOS</key>
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
- <integer>943</integer>
+ <integer>29</integer>
</array>
<key>IBSystem Version</key>
- <string>9B18</string>
+ <string>8S165</string>
<key>targetFramework</key>
<string>IBCocoaFramework</string>
</dict>
Modified: trunk/Sources/Classes/VideoOpenGLView.h
==============================================================================
--- trunk/Sources/Classes/VideoOpenGLView.h Mon May 12 01:54:37 2008 (r157)
+++ trunk/Sources/Classes/VideoOpenGLView.h Fri Apr 24 12:19:01 2009 (r158)
@@ -5,7 +5,7 @@
#import <QuartzCore/QuartzCore.h>
//include for shared memory
-#include <sys/shm.h>
+#include <sys/mman.h>
//custom class
#import "PlayerWindow.h"
@@ -54,8 +54,7 @@
float org_image_aspect;
//shared memory
- int shm_id;
- struct shmid_ds shm_desc;
+ int shm_fd;
//Movie menu outlets
IBOutlet id HalfSizeMenuItem;
Modified: trunk/Sources/Classes/VideoOpenGLView.m
==============================================================================
--- trunk/Sources/Classes/VideoOpenGLView.m Mon May 12 01:54:37 2008 (r157)
+++ trunk/Sources/Classes/VideoOpenGLView.m Fri Apr 24 12:19:01 2009 (r158)
@@ -46,17 +46,19 @@
isPlaying = YES;
- shm_id = shmget(9849, image_width*image_height*image_bytes, 0666);
- if (shm_id == -1)
+ shm_fd = shm_open("mplayerosx", O_RDONLY, S_IRUSR);
+ if (shm_fd == -1)
{
- NSLog(@"Failed to get shared memory id from mplayer (shmget)");
+ NSLog(@"Failed to get shared memory id from mplayer (shm_open)");
return 0;
}
-
- image_data = shmat(shm_id, NULL, 0);
- if (!image_data)
+
+ image_data = mmap(NULL, image_width*image_height*image_bytes,
+ PROT_READ, MAP_SHARED, shm_fd, 0);
+
+ if (image_data == MAP_FAILED)
{
- NSLog(@"Failed to map shared memory from mplayer (shmat)");
+ NSLog(@"Failed to map shared memory from mplayer (mmap)");
return 0;
}
@@ -104,11 +106,11 @@
isPlaying = NO;
//make sure we destroy the shared buffer
- //if(image_data != NULL)
- {
- if (shmdt(image_data) == -1)
- NSLog(@"shmdt: ");
- }
+ if (munmap(image_data, image_width*image_height*image_bytes) == -1)
+ NSLog(@"munmap failed");
+
+ if (shm_unlink("mplayerosx") == -1)
+ NSLog(@"shm_unlink failed");
free(image_buffer);
Modified: trunk/Sources/Controllers/AppController.m
==============================================================================
--- trunk/Sources/Controllers/AppController.m Mon May 12 01:54:37 2008 (r157)
+++ trunk/Sources/Controllers/AppController.m Fri Apr 24 12:19:01 2009 (r158)
@@ -235,7 +235,7 @@
- (IBAction) donate:(id)sender
{
- [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: @"https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=nicolas%2eplourde%40gmail%2ecom&item_name=MPlayer%20OSX%20Donation"]];
+ [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: @"https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=mplayerosx%40gmail%2ecom&item_name=MPlayer%20OSX%20Donation"]];
}
/************************************************************************************
Modified: trunk/TODO
==============================================================================
--- trunk/TODO Mon May 12 01:54:37 2008 (r157)
+++ trunk/TODO Fri Apr 24 12:19:01 2009 (r158)
@@ -6,3 +6,5 @@
-Build and release Instruction
-Playlist Window
-Mencoder Save As
+ -Proper CoreVideo support
+ -improve fullscreen mode
\ No newline at end of file
More information about the mplayerosx-devel
mailing list