From d4facfaae848341f1c2b126a39fbbfb7464b0152 Mon Sep 17 00:00:00 2001 From: eddyg Date: Thu, 30 Aug 2007 22:51:26 +0000 Subject: Back out the GUI handling code for native language prefs. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@905 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/Controller.mm | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'macosx') diff --git a/macosx/Controller.mm b/macosx/Controller.mm index 73f9ca1a3..f1c0673b1 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -6,7 +6,6 @@ #include "Controller.h" #include "a52dec/a52.h" -#import "lang.h" #import "HBOutputPanelController.h" #import "HBPreferencesController.h" /* Added to integrate scanning into HBController */ @@ -1483,26 +1482,6 @@ list = hb_get_titles( fHandle ); } job->grayscale = ( [fVidGrayscaleCheck state] == NSOnState ); - - if ([[NSUserDefaults standardUserDefaults] boolForKey:@"PreferredLanguageSubtitles"] == 1) - { - /* - * This user prefers to have subtitles when the default language - * is not their own. So set the native language seleector to their - * language. - * - * Unfortunatly for us the language in the GUI is not in the - * right ISO-639-3 format that native_language expects. - */ - NSString * language = [[NSUserDefaults standardUserDefaults] stringForKey:@"DefaultLanguage"]; - iso639_lang_t *lang_code = lang_for_english( [ language cString ] ); - if( lang_code ) - { - job->native_language = lang_code->iso639_2; - } else { - job->native_language = NULL; - } - } /* Subtitle settings */ job->subtitle = [fSubPopUp indexOfSelectedItem] - 2; @@ -1950,16 +1929,7 @@ list = hb_get_titles( fHandle ); [self addAllAudioTracksToPopUp: fAudLang2PopUp]; /* search for the first instance of our prefs default language for track 1, and set track 2 to "none" */ NSString * audioSearchPrefix = [[NSUserDefaults standardUserDefaults] stringForKey:@"DefaultLanguage"]; - if ([[NSUserDefaults standardUserDefaults] boolForKey:@"PreferredLanguageSubtitles"] != 1) - { [self selectAudioTrackInPopUp: fAudLang1PopUp searchPrefixString: audioSearchPrefix selectIndexIfNotFound: 1]; - } else { - /* - * We prefer to have subtitles and not change the audio language from the - * default (first one). - */ - [self selectAudioTrackInPopUp: fAudLang1PopUp searchPrefixString: NULL selectIndexIfNotFound: 1]; - } [self selectAudioTrackInPopUp: fAudLang2PopUp searchPrefixString: NULL selectIndexIfNotFound: 0]; /* changing the title may have changed the audio channels on offer, */ -- cgit v1.2.3