diff options
| -rw-r--r-- | macosx/Controller.mm | 54 | ||||
| -rw-r--r-- | macosx/QueueController.mm | 5 |
2 files changed, 49 insertions, 10 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm index 0302d0455..29cbe8c19 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -11,19 +11,29 @@ #define _(a) NSLocalizedString(a,NULL) -static int FormatSettings[3][4] = +static int FormatSettings[4][10] = { { HB_MUX_MP4 | HB_VCODEC_FFMPEG | HB_ACODEC_FAAC, - HB_MUX_MP4 | HB_VCODEC_X264 | HB_ACODEC_FAAC, - 0, - 0 }, + HB_MUX_MP4 | HB_VCODEC_X264 | HB_ACODEC_FAAC, + 0, + 0}, { HB_MUX_AVI | HB_VCODEC_FFMPEG | HB_ACODEC_LAME, - HB_MUX_AVI | HB_VCODEC_FFMPEG | HB_ACODEC_AC3, - HB_MUX_AVI | HB_VCODEC_X264 | HB_ACODEC_LAME, - HB_MUX_AVI | HB_VCODEC_X264 | HB_ACODEC_AC3 }, + HB_MUX_AVI | HB_VCODEC_FFMPEG | HB_ACODEC_AC3, + HB_MUX_AVI | HB_VCODEC_X264 | HB_ACODEC_LAME, + HB_MUX_AVI | HB_VCODEC_X264 | HB_ACODEC_AC3}, { HB_MUX_OGM | HB_VCODEC_FFMPEG | HB_ACODEC_VORBIS, - HB_MUX_OGM | HB_VCODEC_FFMPEG | HB_ACODEC_LAME, - 0, - 0 } }; + HB_MUX_OGM | HB_VCODEC_FFMPEG | HB_ACODEC_LAME, + 0, + 0 }, + { HB_MUX_MKV | HB_VCODEC_FFMPEG | HB_ACODEC_FAAC, + HB_MUX_MKV | HB_VCODEC_FFMPEG | HB_ACODEC_AC3, + HB_MUX_MKV | HB_VCODEC_FFMPEG | HB_ACODEC_LAME, + HB_MUX_MKV | HB_VCODEC_FFMPEG | HB_ACODEC_VORBIS, + HB_MUX_MKV | HB_VCODEC_X264 | HB_ACODEC_FAAC, + HB_MUX_MKV | HB_VCODEC_X264 | HB_ACODEC_AC3, + HB_MUX_MKV | HB_VCODEC_X264 | HB_ACODEC_LAME, + HB_MUX_MKV | HB_VCODEC_X264 | HB_ACODEC_VORBIS, + 0, + 0 } }; /******************************* * HBController implementation * @@ -173,6 +183,7 @@ static int FormatSettings[3][4] = [fDstFormatPopUp addItemWithTitle: _( @"MP4 file" )]; [fDstFormatPopUp addItemWithTitle: _( @"AVI file" )]; [fDstFormatPopUp addItemWithTitle: _( @"OGM file" )]; + [fDstFormatPopUp addItemWithTitle: _( @"MKV file" )]; [fDstFormatPopUp selectItemAtIndex: 0]; [self FormatPopUpChanged: NULL]; @@ -1406,6 +1417,29 @@ if (checkScanCount > currentScanCount) [fCreateChapterMarkers setEnabled: NO]; [fCreateChapterMarkers setState: NSOffState]; break; + case 3: + ext = "mkv"; + [fDstCodecsPopUp addItemWithTitle: + _( @"MPEG-4 Video / AAC Audio" )]; + [fDstCodecsPopUp addItemWithTitle: + _( @"MPEG-4 Video / AC-3 Audio" )]; + [fDstCodecsPopUp addItemWithTitle: + _( @"MPEG-4 Video / MP3 Audio" )]; + [fDstCodecsPopUp addItemWithTitle: + _( @"MPEG-4 Video / Vorbis Audio" )]; + + [fDstCodecsPopUp addItemWithTitle: + _( @"AVC/H.264 Video / AAC Audio" )]; + [fDstCodecsPopUp addItemWithTitle: + _( @"AVC/H.264 Video / AC-3 Audio" )]; + [fDstCodecsPopUp addItemWithTitle: + _( @"AVC/H.264 Video / MP3 Audio" )]; + [fDstCodecsPopUp addItemWithTitle: + _( @"AVC/H.264 Video / Vorbis Audio" )]; + /* We disable the create chapters checkbox here since we are NOT .mp4 + and make sure it is unchecked*/ + [fCreateChapterMarkers setEnabled: YES]; + break; } [self CodecsPopUpChanged: NULL]; diff --git a/macosx/QueueController.mm b/macosx/QueueController.mm index eee7fe60b..db5cbd3f0 100644 --- a/macosx/QueueController.mm +++ b/macosx/QueueController.mm @@ -112,6 +112,11 @@ { jobFormat = @"OGM"; // HB_MUX_OGM } + if (j->mux == 2097152) + { + jobFormat = @"MKV"; // HB_MUX_MKV + } + // 2097152 /* Video Codec settings (Encoder in the gui) */ if (j->vcodec == 1) { |