Revert HB mac gui to m0k layout for impending 0.7.2 release.

Note: pri's language default combobox is also gone in this reversion for the preferences window. However, the underlying code for it is still retained in controller.mm.

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

1 files changed, 9 insertions, 7 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index a2e872a64..bd23c888d 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -303,11 +303,8 @@ static int FormatSettings[3][4] =
                     stringWithFormat: @"%d - %02dh%02dm%02ds",
                     title->index, title->hours, title->minutes,
                     title->seconds]];
-					
-					
-            
 			
-			}
+            }
 
             [self TitlePopUpChanged: NULL];
             [self EnableUI: YES];
@@ -597,13 +594,17 @@ static int FormatSettings[3][4] =
     }
     if( job->vcodec & HB_VCODEC_X264 )
     {
-	 if ([fVidEncoderPopUp indexOfSelectedItem] < 1 )
+	 if ([fVidEncoderPopUp indexOfSelectedItem] > 0 )
 	    {
 		/* Just use new Baseline Level 3.0 
 		Lets Deprecate Baseline Level 1.3*/
 		job->h264_level = 30;
 		job->mux = HB_MUX_IPOD;
 		}
+		
+		/* Set this flag to switch from Constant Quantizer(default) to Constant Rate Factor */
+		// job->crf = 1;
+		
         job->h264_13 = [fVidEncoderPopUp indexOfSelectedItem];
     }
 
@@ -944,8 +945,9 @@ static int FormatSettings[3][4] =
     {
         /* MPEG-4 -> H.264 */
         [fVidEncoderPopUp removeAllItems];
-		[fVidEncoderPopUp addItemWithTitle: @"x264 (h.264 Baseline iPod)"];
-        [fVidEncoderPopUp addItemWithTitle: @"x264 (h.264 Main)"];
+		[fVidEncoderPopUp addItemWithTitle: @"x264 (h.264 Main)"];
+		[fVidEncoderPopUp addItemWithTitle: @"x264 (h.264 iPod)"];
+        
         
     }
     else if( ( FormatSettings[format][codecs] & HB_VCODEC_FFMPEG ) )