summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
Diffstat (limited to 'macosx')
-rw-r--r--macosx/English.lproj/InfoPlist.stringsbin500 -> 520 bytes
-rw-r--r--macosx/English.lproj/MainMenu.nib/info.nib11
-rw-r--r--macosx/English.lproj/MainMenu.nib/objects.nibbin19591 -> 19603 bytes
-rw-r--r--macosx/HandBrake.xcode/project.pbxproj6
-rw-r--r--macosx/PictureGLView.mm128
-rw-r--r--macosx/i18n/French.stringsbin10044 -> 10100 bytes
-rw-r--r--macosx/i18n/German.stringsbin4318 -> 10126 bytes
-rw-r--r--macosx/i18n/it.stringsbin0 -> 10236 bytes
-rw-r--r--macosx/i18n/pl.stringsbin0 -> 10110 bytes
-rw-r--r--macosx/i18n/ru.stringsbin0 -> 9870 bytes
10 files changed, 77 insertions, 68 deletions
diff --git a/macosx/English.lproj/InfoPlist.strings b/macosx/English.lproj/InfoPlist.strings
index 714d974fa..64540600c 100644
--- a/macosx/English.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/InfoPlist.strings
Binary files differ
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 80f27b803..c578cde0a 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -9,9 +9,9 @@
<key>29</key>
<string>297 654 165 44 0 0 1440 878 </string>
<key>556</key>
- <string>513 432 417 306 0 0 1440 878 </string>
+ <string>309 129 417 306 0 0 1440 878 </string>
<key>583</key>
- <string>573 493 144 171 0 0 1440 878 </string>
+ <string>650 499 144 171 0 0 1440 878 </string>
<key>689</key>
<string>513 258 418 610 0 0 1440 878 </string>
</dict>
@@ -19,13 +19,12 @@
<string>349.0</string>
<key>IBOpenObjects</key>
<array>
- <integer>689</integer>
+ <integer>434</integer>
<integer>365</integer>
<integer>583</integer>
- <integer>29</integer>
- <integer>556</integer>
- <integer>434</integer>
<integer>21</integer>
+ <integer>689</integer>
+ <integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>7D24</string>
diff --git a/macosx/English.lproj/MainMenu.nib/objects.nib b/macosx/English.lproj/MainMenu.nib/objects.nib
index b088624ed..7990b4e2c 100644
--- a/macosx/English.lproj/MainMenu.nib/objects.nib
+++ b/macosx/English.lproj/MainMenu.nib/objects.nib
Binary files differ
diff --git a/macosx/HandBrake.xcode/project.pbxproj b/macosx/HandBrake.xcode/project.pbxproj
index 6416e2c67..1ecef4736 100644
--- a/macosx/HandBrake.xcode/project.pbxproj
+++ b/macosx/HandBrake.xcode/project.pbxproj
@@ -301,7 +301,7 @@
<key>CFBundleExecutable</key>
<string>HandBrake</string>
<key>CFBundleGetInfoString</key>
- <string>HandBrake 0.5.2+ - By Eric Petit &lt;[email protected]&gt;</string>
+ <string>HandBrake 0.6.0-test1+ - By Eric Petit &lt;[email protected]&gt;</string>
<key>CFBundleIconFile</key>
<string>HandBrake.icns</string>
<key>CFBundleIdentifier</key>
@@ -313,11 +313,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.5.2+</string>
+ <string>0.6.0-test1+</string>
<key>CFBundleSignature</key>
<string>HB##</string>
<key>CFBundleVersion</key>
- <string>0.5.2+</string>
+ <string>0.6.0-test1+</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
diff --git a/macosx/PictureGLView.mm b/macosx/PictureGLView.mm
index 8df19907b..de755cba7 100644
--- a/macosx/PictureGLView.mm
+++ b/macosx/PictureGLView.mm
@@ -1,9 +1,10 @@
-/* $Id: PictureGLView.mm,v 1.3 2003/11/03 22:01:13 titer Exp $
+/* $Id: PictureGLView.mm,v 1.4 2004/02/23 18:08:41 titer Exp $
This file is part of the HandBrake source code.
Homepage: <http://handbrake.m0k.org/>.
It may be used under the terms of the GNU General Public License. */
+#include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h>
#include <math.h>
@@ -112,7 +113,8 @@ uint8_t * truc;
glDepthFunc( GL_LEQUAL );
glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST );
-#define ANIMATION_TIME 500000
+#define ANIMATION_TIME 1000000
+#define FRAME_PER_SEC 30
rotation = 0.0;
float w = ( how == HB_ANIMATE_LEFT ) ? 1.0 : -1.0;
@@ -126,7 +128,7 @@ uint8_t * truc;
[self drawAnimation: how];
- rotation += w;
+ rotation += w * 90 * 1000000 / ANIMATION_TIME / FRAME_PER_SEC;
if( w * rotation >= 90.0 )
{
break;
@@ -176,6 +178,7 @@ uint8_t * truc;
[[self openGLContext] makeCurrentContext];
[self reshape];
+
glGenTextures( 2, texture );
truc = (uint8_t*) malloc( 1024*1024*4 );
@@ -197,62 +200,69 @@ uint8_t * truc;
- (void) drawAnimation: (int) how
{
- glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
- glMatrixMode( GL_PROJECTION );
- glLoadIdentity();
- glFrustum( -1.0, 1.0, -1.0, 1.0, PROUT, 20.0 );
- glMatrixMode( GL_MODELVIEW );
- glLoadIdentity();
- glTranslatef( 0.0, 0.0, translation );
- glRotatef( rotation, 0.0, 1.0, 0.0 );
-
- glEnable( GL_POLYGON_SMOOTH );
- glHint( GL_POLYGON_SMOOTH_HINT, GL_NICEST );
-
- glBindTexture( GL_TEXTURE_2D, texture[0] );
-
- glBegin( GL_QUADS );
- glTexCoord2f( 0.0, 0.0 );
- glVertex3f( -1.0, -1.0, 1.0 );
- glTexCoord2f( ( 2.0 + fTitle->outWidthMax ) / 1024, 0.0 );
- glVertex3f( 1.0, -1.0, 1.0 );
- glTexCoord2f( ( 2.0 + fTitle->outWidthMax ) / 1024,
- ( 2.0 + fTitle->outHeightMax ) / 1024 );
- glVertex3f( 1.0, 1.0, 1.0 );
- glTexCoord2f( 0.0, ( 2.0 + fTitle->outHeightMax ) / 1024 );
- glVertex3f( -1.0, 1.0, 1.0 );
- glEnd();
-
- glBindTexture( GL_TEXTURE_2D, texture[1] );
-
- glBegin( GL_QUADS );
- if( how == HB_ANIMATE_RIGHT )
- {
- glTexCoord2f( 0.0, 0.0 );
- glVertex3f( 1.0, -1.0, 1.0 );
- glTexCoord2f( ( 2.0 + fTitle->outWidthMax ) / 1024, 0.0 );
- glVertex3f( 1.0, -1.0, -1.0 );
- glTexCoord2f( ( 2.0 + fTitle->outWidthMax ) / 1024,
- ( 2.0 + fTitle->outHeightMax ) / 1024 );
- glVertex3f( 1.0, 1.0, -1.0 );
- glTexCoord2f( 0.0, ( 2.0 + fTitle->outHeightMax ) / 1024 );
- glVertex3f( 1.0, 1.0, 1.0 );
- }
- else
- {
- glTexCoord2f( 0.0, 0.0 );
- glVertex3f( -1.0, -1.0, -1.0 );
- glTexCoord2f( ( 2.0 + fTitle->outWidthMax ) / 1024, 0.0 );
- glVertex3f( -1.0, -1.0, 1.0 );
- glTexCoord2f( ( 2.0 + fTitle->outWidthMax ) / 1024,
- ( 2.0 + fTitle->outHeightMax ) / 1024 );
- glVertex3f( -1.0, 1.0, 1.0 );
- glTexCoord2f( 0.0, ( 2.0 + fTitle->outHeightMax ) / 1024 );
- glVertex3f( -1.0, 1.0, -1.0 );
- }
- glEnd();
-
- [[self openGLContext] flushBuffer];
+ /* Swap buffers only during the vertical retrace of the monitor.
+ http://developer.apple.com/documentation/GraphicsImaging/
+ Conceptual/OpenGL/chap5/chapter_5_section_44.html */
+ long params[] = { 1 };
+ CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval,
+ params );
+
+ glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+ glMatrixMode( GL_PROJECTION );
+ glLoadIdentity();
+ glFrustum( -1.0, 1.0, -1.0, 1.0, PROUT, 20.0 );
+ glMatrixMode( GL_MODELVIEW );
+ glLoadIdentity();
+ glTranslatef( 0.0, 0.0, translation );
+ glRotatef( rotation, 0.0, 1.0, 0.0 );
+
+ glEnable( GL_POLYGON_SMOOTH );
+ glHint( GL_POLYGON_SMOOTH_HINT, GL_NICEST );
+
+ glBindTexture( GL_TEXTURE_2D, texture[0] );
+
+ glBegin( GL_QUADS );
+ glTexCoord2f( 0.0, 0.0 );
+ glVertex3f( -1.0, -1.0, 1.0 );
+ glTexCoord2f( ( 2.0 + fTitle->outWidthMax ) / 1024, 0.0 );
+ glVertex3f( 1.0, -1.0, 1.0 );
+ glTexCoord2f( ( 2.0 + fTitle->outWidthMax ) / 1024,
+ ( 2.0 + fTitle->outHeightMax ) / 1024 );
+ glVertex3f( 1.0, 1.0, 1.0 );
+ glTexCoord2f( 0.0, ( 2.0 + fTitle->outHeightMax ) / 1024 );
+ glVertex3f( -1.0, 1.0, 1.0 );
+ glEnd();
+
+ glBindTexture( GL_TEXTURE_2D, texture[1] );
+
+ glBegin( GL_QUADS );
+ if( how == HB_ANIMATE_RIGHT )
+ {
+ glTexCoord2f( 0.0, 0.0 );
+ glVertex3f( 1.0, -1.0, 1.0 );
+ glTexCoord2f( ( 2.0 + fTitle->outWidthMax ) / 1024, 0.0 );
+ glVertex3f( 1.0, -1.0, -1.0 );
+ glTexCoord2f( ( 2.0 + fTitle->outWidthMax ) / 1024,
+ ( 2.0 + fTitle->outHeightMax ) / 1024 );
+ glVertex3f( 1.0, 1.0, -1.0 );
+ glTexCoord2f( 0.0, ( 2.0 + fTitle->outHeightMax ) / 1024 );
+ glVertex3f( 1.0, 1.0, 1.0 );
+ }
+ else
+ {
+ glTexCoord2f( 0.0, 0.0 );
+ glVertex3f( -1.0, -1.0, -1.0 );
+ glTexCoord2f( ( 2.0 + fTitle->outWidthMax ) / 1024, 0.0 );
+ glVertex3f( -1.0, -1.0, 1.0 );
+ glTexCoord2f( ( 2.0 + fTitle->outWidthMax ) / 1024,
+ ( 2.0 + fTitle->outHeightMax ) / 1024 );
+ glVertex3f( -1.0, 1.0, 1.0 );
+ glTexCoord2f( 0.0, ( 2.0 + fTitle->outHeightMax ) / 1024 );
+ glVertex3f( -1.0, 1.0, -1.0 );
+ }
+ glEnd();
+
+ [[self openGLContext] flushBuffer];
}
- (void) drawRect: (NSRect) rect
diff --git a/macosx/i18n/French.strings b/macosx/i18n/French.strings
index a81b4ad56..c1218f28c 100644
--- a/macosx/i18n/French.strings
+++ b/macosx/i18n/French.strings
Binary files differ
diff --git a/macosx/i18n/German.strings b/macosx/i18n/German.strings
index 99220c2cc..7ab175789 100644
--- a/macosx/i18n/German.strings
+++ b/macosx/i18n/German.strings
Binary files differ
diff --git a/macosx/i18n/it.strings b/macosx/i18n/it.strings
new file mode 100644
index 000000000..26587fa3a
--- /dev/null
+++ b/macosx/i18n/it.strings
Binary files differ
diff --git a/macosx/i18n/pl.strings b/macosx/i18n/pl.strings
new file mode 100644
index 000000000..8713a365a
--- /dev/null
+++ b/macosx/i18n/pl.strings
Binary files differ
diff --git a/macosx/i18n/ru.strings b/macosx/i18n/ru.strings
new file mode 100644
index 000000000..cc6080f7c
--- /dev/null
+++ b/macosx/i18n/ru.strings
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-13 21:05:54 +0000