diff options
| author | sr55 <[email protected]> | 2009-07-04 15:32:41 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2009-07-04 15:32:41 +0000 |
| commit | 2a0df5e5ee4c084082487d2e3d717860ee705738 (patch) | |
| tree | ff06bd1b175cf94b135cd2f7ef81f6ac1a139a44 /win/C#/Functions | |
| parent | bdf19259ac2d6ac94abf0fad38ce6c98e3e58460 (diff) | |
WinGui:
- Remove M4v from format dropdown and add new option "Use iPod/iTunes friendly (.m4v) file extension for MP4
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2662 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/Functions')
| -rw-r--r-- | win/C#/Functions/Main.cs | 9 | ||||
| -rw-r--r-- | win/C#/Functions/PresetLoader.cs | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs index 1b223babd..d2e136a91 100644 --- a/win/C#/Functions/Main.cs +++ b/win/C#/Functions/Main.cs @@ -162,10 +162,13 @@ namespace Handbrake.Functions // Add the appropriate file extension
if (format == 0)
- destination_filename += ".mp4";
+ {
+ if (Properties.Settings.Default.useM4v)
+ destination_filename += ".m4v";
+ else
+ destination_filename += ".mp4";
+ }
else if (format == 1)
- destination_filename += ".m4v";
- else if (format == 2)
destination_filename += ".mkv";
// Now work out the path where the file will be stored.
diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs index 043436c02..28cec6805 100644 --- a/win/C#/Functions/PresetLoader.cs +++ b/win/C#/Functions/PresetLoader.cs @@ -45,14 +45,9 @@ namespace Handbrake.Functions if (presetQuery.Format != null)
{
- if (presetQuery.Format == "mp4")
+ if (presetQuery.Format == "mp4" || presetQuery.Format == "m4v")
mainWindow.drop_format.SelectedIndex = 0;
- else if (presetQuery.Format == "m4v")
- mainWindow.drop_format.SelectedIndex = 1;
else if (presetQuery.Format == "mkv")
- mainWindow.drop_format.SelectedIndex = 2;
-
- if (presetQuery.ChapterMarkers && presetQuery.Format == "mp4")
mainWindow.drop_format.SelectedIndex = 1;
}
|