diff options
| author | Rodeo <[email protected]> | 2012-02-21 23:56:12 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-02-21 23:56:12 +0000 |
| commit | 8bd4efe5c7891fc428d56690dfd11aece7734d0e (patch) | |
| tree | 396f9e2b342ff01b629d3623cf0da7b5f9658b43 /gtk | |
| parent | 2599def15a4b622c9f0e6d354dd9c0ad90531d6c (diff) | |
Add HB_INVALID_AUDIO_QUALITY define. -1 is valid for Vorbis VBR and thus doesn't work for this purpose.
Fixes Vorbis VBR with --aq < 0
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4461 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/src/audiohandler.c | 6 | ||||
| -rw-r--r-- | gtk/src/hb-backend.c | 4 | ||||
| -rw-r--r-- | gtk/src/queuehandler.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c index 693b5bff7..52c5f8599 100644 --- a/gtk/src/audiohandler.c +++ b/gtk/src/audiohandler.c @@ -578,7 +578,7 @@ ghb_audio_list_refresh_selected(signal_user_data_t *ud) codec = ghb_settings_combo_option(asettings, "AudioEncoderActual"); double quality = ghb_settings_get_double(asettings, "AudioTrackQuality"); if (ghb_settings_get_boolean(asettings, "AudioTrackQualityEnable") && - quality >= 0) + quality != HB_INVALID_AUDIO_QUALITY) { int codec = ghb_settings_combo_int(asettings, "AudioEncoderActual"); s_quality = ghb_format_quality("Q/", codec, quality); @@ -647,7 +647,7 @@ ghb_audio_list_refresh(signal_user_data_t *ud) codec = ghb_settings_combo_option(asettings, "AudioEncoderActual"); double quality = ghb_settings_get_double(asettings, "AudioTrackQuality"); if (ghb_settings_get_boolean(asettings, "AudioTrackQualityEnable") && - quality >= 0) + quality != HB_INVALID_AUDIO_QUALITY) { int codec = ghb_settings_combo_int(asettings, "AudioEncoderActual"); s_quality = ghb_format_quality("Q/", codec, quality); @@ -1046,7 +1046,7 @@ ghb_add_audio_to_ui(GtkBuilder *builder, const GValue *settings) codec = ghb_settings_combo_option(settings, "AudioEncoderActual"); double quality = ghb_settings_get_double(settings, "AudioTrackQuality"); if (ghb_settings_get_boolean(settings, "AudioTrackQualityEnable") && - quality >= 0) + quality != HB_INVALID_AUDIO_QUALITY) { int codec = ghb_settings_combo_int(settings, "AudioEncoderActual"); s_quality = ghb_format_quality("Q/", codec, quality); diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 695bb5465..837da3db2 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -4986,14 +4986,14 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex) audio.out.samplerate = srate; double quality = ghb_settings_get_double(asettings, "AudioTrackQuality"); if (ghb_settings_get_boolean(asettings, "AudioTrackQualityEnable") && - quality != -1) + quality != HB_INVALID_AUDIO_QUALITY) { audio.out.quality = quality; audio.out.bitrate = -1; } else { - audio.out.quality = -1; + audio.out.quality = HB_INVALID_AUDIO_QUALITY; audio.out.bitrate = ghb_settings_combo_int(asettings, "AudioBitrate"); diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c index 939a805a7..405e96a3c 100644 --- a/gtk/src/queuehandler.c +++ b/gtk/src/queuehandler.c @@ -411,7 +411,7 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter) acodec = ghb_settings_combo_option(asettings, "AudioEncoderActual"); double q = ghb_settings_get_double(asettings, "AudioTrackQuality"); if (ghb_settings_get_boolean(asettings, "AudioTrackQualityEnable") && - q >= 0) + q != HB_INVALID_AUDIO_QUALITY) { int codec = ghb_settings_combo_int(asettings, "AudioEncoderActual"); quality = ghb_format_quality("Quality: ", codec, q); |