diff options
| author | handbrake <[email protected]> | 2006-12-31 21:45:39 +0000 |
|---|---|---|
| committer | handbrake <[email protected]> | 2006-12-31 21:45:39 +0000 |
| commit | 44f5572c384ee89f03965dbcc9d39027258f6f60 (patch) | |
| tree | e1373b0752b19bc88c99d40fe9e75347b5a2c263 /macosx/Controller.mm | |
| parent | edb4114e462984a73b6fa2d5a16867f56ed0dd22 (diff) | |
Fixed HandBrake Scan Panel for Optical Drive
Uses DVD Name instead of drive location
Displays DVD Name in Main window
h.264 defaults to Baseline Level 3
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@76 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/Controller.mm')
| -rw-r--r-- | macosx/Controller.mm | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm index 10b1231c6..351677154 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -254,6 +254,7 @@ static int FormatSettings[3][4] = - (void) UpdateUI: (NSTimer *) timer { + hb_state_t s; hb_get_state( fHandle, &s ); @@ -286,7 +287,8 @@ static int FormatSettings[3][4] = { title = (hb_title_t *) hb_list_item( list, i ); [fSrcDVD2Field setStringValue: [NSString - stringWithUTF8String: title->dvd]]; + stringWithUTF8String: title->name]]; + [fSrcTitlePopUp addItemWithTitle: [NSString stringWithFormat: @"%d - %02dh%02dm%02ds", title->index, title->hours, title->minutes, @@ -556,18 +558,12 @@ static int FormatSettings[3][4] = } if( job->vcodec & HB_VCODEC_X264 ) { - switch([fVidEncoderPopUp indexOfSelectedItem]) { - case 1: - /* Baseline Level 1.3 - For iPods pre firmware 1.2 */ - job->h264_level = 13; - break; - case 2: - /* Baseline Level 3.0 - For iPods w/ fimware 1.2 */ - job->h264_level = 30; - job->mux = HB_MUX_IPOD; - break; + if ([fVidEncoderPopUp indexOfSelectedItem] < 1 ) + { + /* Just use new Baseline Level 3.0 + Lets Deprecate Baseline Level 1.3*/ + job->h264_level = 30; + job->mux = HB_MUX_IPOD; } job->h264_13 = [fVidEncoderPopUp indexOfSelectedItem]; } @@ -893,9 +889,9 @@ static int FormatSettings[3][4] = { /* MPEG-4 -> H.264 */ [fVidEncoderPopUp removeAllItems]; - [fVidEncoderPopUp addItemWithTitle: @"x264 (Main profile)"]; - [fVidEncoderPopUp addItemWithTitle: @"x264 (Baseline profile level 1.3)"]; - [fVidEncoderPopUp addItemWithTitle: @"x264 (Baseline profile level 3.0)"]; + [fVidEncoderPopUp addItemWithTitle: @"x264 (h.264 Baseline iPod)"]; + [fVidEncoderPopUp addItemWithTitle: @"x264 (h.264 Main)"]; + } else if( ( FormatSettings[format][codecs] & HB_VCODEC_FFMPEG ) ) { |