HandBrake 0.6.2

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@15 b64f7644-9d1e-0410-96f1-a4d463321fa5

6 files changed, 14 insertions, 252 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 8f6e94d2e..eb53a9dd5 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1,4 +1,4 @@
-/* $Id: Controller.mm,v 1.30 2004/03/12 14:22:19 titer Exp $
+/* $Id: Controller.mm,v 1.31 2004/04/21 21:21:17 titer Exp $
 
    This file is part of the HandBrake source code.
    Homepage: <http://handbrake.m0k.org/>.
@@ -850,8 +850,8 @@ static void _ScanDone( void * data, HBList * titleList )
         title = (HBTitle*) HBListItemAt( fTitleList, i );
         [[fRipTitlePopUp menu] addItemWithTitle:
             [NSString stringWithFormat: @"%d - %02dh%02dm%02ds",
-            title->index, title->length / 3600, ( title->length % 3600 )
-            / 60, title->length % 60] action: nil keyEquivalent: @""];
+            title->title, title->hours, title->minutes,
+            title->seconds] action: nil keyEquivalent: @""];
     }
     [self TitlePopUpChanged: self];
 }
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index fab934582..07d1cfa67 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -3,11 +3,11 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>43 111 381 380 0 0 1440 878 </string>
+	<string>37 177 381 380 0 0 1440 878 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
-		<string>297 654 165 44 0 0 1440 878 </string>
+		<string>277 674 165 44 0 0 1440 878 </string>
 		<key>556</key>
 		<string>130 59 470 306 0 0 1440 878 </string>
 		<key>583</key>
@@ -21,11 +21,11 @@
 	<array>
 		<integer>29</integer>
 		<integer>365</integer>
+		<integer>583</integer>
 		<integer>434</integer>
 		<integer>21</integer>
-		<integer>583</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>7D24</string>
+	<string>7F44</string>
 </dict>
 </plist>
diff --git a/macosx/English.lproj/MainMenu.nib/objects.nib b/macosx/English.lproj/MainMenu.nib/objects.nib
index ba5fa1e5e..5a2d37443 100644
--- a/macosx/English.lproj/MainMenu.nib/objects.nib
+++ b/macosx/English.lproj/MainMenu.nib/objects.nib
diff --git a/macosx/HandBrake.xcode/project.pbxproj b/macosx/HandBrake.xcode/project.pbxproj
index 4b5a9117c..c9ac3a6a3 100644
--- a/macosx/HandBrake.xcode/project.pbxproj
+++ b/macosx/HandBrake.xcode/project.pbxproj
@@ -194,24 +194,9 @@
 		};
 		29B97317FDCFA39411CA2CEA = {
 			children = (
-				4D194F36059E0FBC004A33A1,
-				4D548205059E100C00AD5E02,
-				4D194F37059E0FBC004A33A1,
-				4D194F38059E0FBC004A33A1,
 				29B97318FDCFA39411CA2CEA,
-				4D929FED0527907200A80101,
-				4D69F5C80527944A00A80101,
-				4D69F5C90527944A00A80101,
-				4D69F5CA0527944A00A80101,
-				4D69F5CB0527944A00A80101,
-				4D69F5CC0527944A00A80101,
-				4D69F5CD0527944A00A80101,
-				4D69F5CE0527944A00A80101,
-				4DDEF3B905474DCC002904DE,
 				4D118405053054CD00C39CA9,
 				089C165CFE840E0CC02AAC07,
-				4D0AEC1805747B7A00FAB0FD,
-				4D0AEC1C05747B8C00FAB0FD,
 			);
 			isa = PBXGroup;
 			name = Resources;
@@ -277,10 +262,10 @@
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				HEADER_SEARCH_PATHS = "";
-				LIBRARY_SEARCH_PATHS = "../core ../contrib/liba52 ../contrib/libavcodec ../contrib/libdvdcss ../contrib/libdvdplay ../contrib/libdvdread ../contrib/libfaac ../contrib/libmp3lame ../contrib/libmp4v2 ../contrib/libmpeg2 ../contrib/libogg ../contrib/libvorbis ../contrib/libx264 ../contrib/libxvidcore";
+				LIBRARY_SEARCH_PATHS = "";
 				OPTIMIZATION_CFLAGS = "-O3";
 				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
+				OTHER_LDFLAGS = "../core/libhb.a ../contrib/liba52/liba52.a ../contrib/libavcodec/libavcodec.a ../contrib/libdvdread/libdvdread.a ../contrib/libdvdcss/libdvdcss.a ../contrib/libfaac/libfaac.a ../contrib/libmp3lame/libmp3lame.a ../contrib/libmp4v2/libmp4v2.a ../contrib/libmpeg2/libmpeg2.a ../contrib/libvorbis/libvorbis.a ../contrib/libvorbis/libvorbisenc.a ../contrib/libogg/libogg.a ../contrib/libsamplerate/libsamplerate.a ../contrib/libx264/libx264.a ../contrib/libxvidcore/libxvidcore.a";
 				PRODUCT_NAME = HandBrake;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
@@ -302,6 +287,8 @@
 	<string>HandBrake</string>
 	<key>CFBundleExecutable</key>
 	<string>HandBrake</string>
+	<key>CFBundleGetInfoString</key>
+	<string>0.6.2</string>
 	<key>CFBundleIconFile</key>
 	<string>HandBrake.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -313,11 +300,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.1</string>
+	<string>0.6.2</string>
 	<key>CFBundleSignature</key>
 	<string>HB##</string>
 	<key>CFBundleVersion</key>
-	<string>0.6.1</string>
+	<string>0.6.2</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>By Eric Petit &lt;[email protected]&gt;</string>
 	<key>NSMainNibFile</key>
@@ -372,23 +359,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				1058C7A3FEA54F0111CA2CBB,
-				4D929FEE0527907200A80101,
-				4D69F5CF0527944A00A80101,
-				4D69F5D00527944A00A80101,
-				4D69F5D10527944A00A80101,
-				4D69F5D20527944A00A80101,
-				4D69F5D30527944A00A80101,
-				4D69F5D40527944A00A80101,
-				4D69F5D50527944A00A80101,
 				4DEB2025052B055F00C39CA9,
 				4DDE9725052B7B2B00C39CA9,
-				4DDEF3BA05474DCC002904DE,
-				4D0AEC1905747B7A00FAB0FD,
-				4D0AEC1D05747B8C00FAB0FD,
-				4D194F39059E0FBC004A33A1,
-				4D194F3A059E0FBC004A33A1,
-				4D194F3B059E0FBC004A33A1,
-				4D548206059E100C00AD5E02,
 			);
 			isa = PBXFrameworksBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -408,7 +380,7 @@
 			);
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = "0.6.1";
+				CURRENT_PROJECT_VERSION = "0.6.2";
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -441,34 +413,6 @@
 //4D2
 //4D3
 //4D4
-		4D0AEC1805747B7A00FAB0FD = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libfaac.a;
-			path = ../contrib/libfaac/libfaac.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D0AEC1905747B7A00FAB0FD = {
-			fileRef = 4D0AEC1805747B7A00FAB0FD;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4D0AEC1C05747B8C00FAB0FD = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libmp4v2.a;
-			path = ../contrib/libmp4v2/libmp4v2.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D0AEC1D05747B8C00FAB0FD = {
-			fileRef = 4D0AEC1C05747B8C00FAB0FD;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4D118405053054CD00C39CA9 = {
 			isa = PBXFileReference;
 			lastKnownFileType = image.icns;
@@ -482,48 +426,6 @@
 			settings = {
 			};
 		};
-		4D194F36059E0FBC004A33A1 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libvorbis.a;
-			path = ../contrib/libvorbis/libvorbis.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D194F37059E0FBC004A33A1 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libvorbisenc.a;
-			path = ../contrib/libvorbis/libvorbisenc.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D194F38059E0FBC004A33A1 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libx264.a;
-			path = ../contrib/libx264/libx264.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D194F39059E0FBC004A33A1 = {
-			fileRef = 4D194F36059E0FBC004A33A1;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4D194F3A059E0FBC004A33A1 = {
-			fileRef = 4D194F37059E0FBC004A33A1;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4D194F3B059E0FBC004A33A1 = {
-			fileRef = 4D194F38059E0FBC004A33A1;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4D358C000534A91300D654EB = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -552,124 +454,12 @@
 			settings = {
 			};
 		};
-		4D548205059E100C00AD5E02 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libogg.a;
-			path = ../contrib/libogg/libogg.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D548206059E100C00AD5E02 = {
-			fileRef = 4D548205059E100C00AD5E02;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4D6615EA05288C2300A80101 = {
 			fileRef = 4DF3C8CB052889CD00A80101;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
-		4D69F5C80527944A00A80101 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = liba52.a;
-			path = ../contrib/liba52/liba52.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D69F5C90527944A00A80101 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libavcodec.a;
-			path = ../contrib/libavcodec/libavcodec.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D69F5CA0527944A00A80101 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libdvdcss.a;
-			path = ../contrib/libdvdcss/libdvdcss.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D69F5CB0527944A00A80101 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libdvdplay.a;
-			path = ../contrib/libdvdplay/libdvdplay.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D69F5CC0527944A00A80101 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libdvdread.a;
-			path = ../contrib/libdvdread/libdvdread.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D69F5CD0527944A00A80101 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libmp3lame.a;
-			path = ../contrib/libmp3lame/libmp3lame.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D69F5CE0527944A00A80101 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libmpeg2.a;
-			path = ../contrib/libmpeg2/libmpeg2.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D69F5CF0527944A00A80101 = {
-			fileRef = 4D69F5C80527944A00A80101;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4D69F5D00527944A00A80101 = {
-			fileRef = 4D69F5C90527944A00A80101;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4D69F5D10527944A00A80101 = {
-			fileRef = 4D69F5CA0527944A00A80101;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4D69F5D20527944A00A80101 = {
-			fileRef = 4D69F5CB0527944A00A80101;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4D69F5D30527944A00A80101 = {
-			fileRef = 4D69F5CC0527944A00A80101;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4D69F5D40527944A00A80101 = {
-			fileRef = 4D69F5CD0527944A00A80101;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4D69F5D50527944A00A80101 = {
-			fileRef = 4D69F5CE0527944A00A80101;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4D85758E052B78E300C39CA9 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -698,20 +488,6 @@
 			settings = {
 			};
 		};
-		4D929FED0527907200A80101 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libhb.a;
-			path = ../core/libhb.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4D929FEE0527907200A80101 = {
-			fileRef = 4D929FED0527907200A80101;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4DDE9724052B7B2B00C39CA9 = {
 			fallbackIsa = PBXFileReference;
 			isa = PBXFrameworkReference;
@@ -727,20 +503,6 @@
 			settings = {
 			};
 		};
-		4DDEF3B905474DCC002904DE = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libxvidcore.a;
-			path = ../contrib/libxvidcore/libxvidcore.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		4DDEF3BA05474DCC002904DE = {
-			fileRef = 4DDEF3B905474DCC002904DE;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4DEB2024052B055F00C39CA9 = {
 			fallbackIsa = PBXFileReference;
 			isa = PBXFrameworkReference;
diff --git a/macosx/i18n/de.strings b/macosx/i18n/de.strings
index 7ab175789..c00468936 100644
--- a/macosx/i18n/de.strings
+++ b/macosx/i18n/de.strings
diff --git a/macosx/i18n/ja.strings b/macosx/i18n/ja.strings
new file mode 100644
index 000000000..fc457a7a6
--- /dev/null
+++ b/macosx/i18n/ja.strings