diff options
author | maurj <[email protected]> | 2007-04-12 11:42:51 +0000 |
---|---|---|
committer | maurj <[email protected]> | 2007-04-12 11:42:51 +0000 |
commit | aa88ab8a4f716f88c8c584cd1b98fa76e2bae80b (patch) | |
tree | 5da98c0dfda6a8700bd68773d22d41a2132d2c60 /libhb/scan.c | |
parent | 51eec61731b2b4b62ac73b94f35cbd3b4d6a758c (diff) |
Updated the Mac GUI to use the new audio mixdowns. This means that the Mac GUI now supports Dolby PRo Logic 2 mixdowns!
The Audio tab now has two mixdown NSPopUpButtons, which are set to display all of the possible mixdowns for the current input audio codec / output audio codec / input audio channel configuration.
A mixdown of HB_AMIXDOWN_DOLBYPLII is used by default (or the next best mixdown if this isn't possible). Ideally this will become a prefs option to specify your choice of default audio mixdown.
For AC3 passthru, a single mixdown of "AC3 Passthru" is displayed.
I've had to update the Xcode project file, to make the Handbrake target look for headers in the "../contrib/include" folder too. This is so that it can find the a52 headers which are now used by Controller.mm.
I've added an ac3flags property to hb_audio_s, to enable us to access the source ac3 flags outside of libhb. This is set in scan.c for each source audio.
I've updated hb_mixdown_s and the hb_audio_mixdowns[] to include the CLI "short name" version of the mixdowns too, ready for the Mac GUI "default mixdown" prefs saving / loading.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@497 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/scan.c')
-rw-r--r-- | libhb/scan.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libhb/scan.c b/libhb/scan.c index 9e9f9542a..4f28bac6d 100644 --- a/libhb/scan.c +++ b/libhb/scan.c @@ -524,10 +524,13 @@ static void LookForAC3( hb_title_t * title, hb_buffer_t * b ) audio->src_discrete_lfe_channels = 0; } - /* store the AC3 FLAGS for future reference + /* store the AC3 flags for future reference This enables us to find out if we had a stereo or Dolby source later on */ audio->config.a52.ac3flags = flags; + /* store the ac3 flags in the public ac3flags property too, so we can access it from the GUI */ + audio->ac3flags = audio->config.a52.ac3flags; + /* XXX */ if ( (flags & A52_CHANNEL_MASK) == A52_DOLBY ) { sprintf( audio->lang + strlen( audio->lang ), |