summaryrefslogtreecommitdiffstats
path: root/libhb/common.h
diff options
context:
space:
mode:
authormaurj <[email protected]>2007-04-12 11:42:51 +0000
committermaurj <[email protected]>2007-04-12 11:42:51 +0000
commitaa88ab8a4f716f88c8c584cd1b98fa76e2bae80b (patch)
tree5da98c0dfda6a8700bd68773d22d41a2132d2c60 /libhb/common.h
parent51eec61731b2b4b62ac73b94f35cbd3b4d6a758c (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/common.h')
-rw-r--r--libhb/common.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/libhb/common.h b/libhb/common.h
index 4934063e5..3ed8f7791 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -75,6 +75,7 @@ struct hb_mixdown_s
{
char * human_readable_name;
char * internal_name;
+ char * short_name;
int amixdown;
};
@@ -271,6 +272,9 @@ struct hb_audio_s
int src_discrete_lfe_channels;
int src_encoded_front_channels;
int src_encoded_rear_channels;
+
+ /* ac3flags is only set when the source audio format is HB_ACODEC_AC3 */
+ int ac3flags;
#ifdef __LIBHB__
/* Internal data */