[Merge] Merging fixes 6569 to 6571

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.10.x@6572 b64f7644-9d1e-0410-96f1-a4d463321fa5

6 files changed, 56 insertions, 31 deletions

diff --git a/test/test.c b/test/test.c
index 5b9e56fbe..f4cee2c50 100644
--- a/test/test.c
+++ b/test/test.c
@@ -3061,8 +3061,6 @@ static void ShowHelp()
     fprintf(out,
     "                            (default: autodetected from file name)\n"
     "    -m, --markers           Add chapter markers\n"
-    "    -4, --large-file        Create 64-bit mp4 files that can hold more than 4 GB\n"
-    "                            of data. Note: breaks pre-iOS iPod compatibility.\n"
     "    -O, --optimize          Optimize mp4 files for HTTP streaming (\"fast start\")\n"
     "    -I, --ipod-atom         Mark mp4 files so 5.5G iPods will accept them\n"
     "    -P, --use-opencl        Use OpenCL where applicable\n"
@@ -3457,18 +3455,18 @@ static void ShowPresets()
     printf("\n< Devices\n");
     printf("\n   + Universal:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 720 -Y 576 --loose-anamorphic --modulus 2 -m --x264-preset fast --h264-profile baseline --h264-level 3.0\n");
     printf("\n   + iPod:  -e x264  -q 22.0 -r 30 --pfr  -a 1 -E ffaac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -I -X 320 -Y 240 --modulus 2 -m --x264-preset medium --h264-profile baseline --h264-level 1.3\n");
-    printf("\n   + iPhone & iPod touch:  -e x264  -q 22.0 -r 30 --pfr  -a 1 -E ffaac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 960 -Y 640 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
-    printf("\n   + iPad:  -e x264  -q 20.0 -r 30 --pfr  -a 1 -E ffaac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
-    printf("\n   + AppleTV:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 960 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1 -x qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n");
-    printf("\n   + AppleTV 2:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
-    printf("\n   + AppleTV 3:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 1920 -Y 1080 --decomb=fast --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 4.0\n");
+    printf("\n   + iPhone & iPod touch:  -e x264  -q 22.0 -r 30 --pfr  -a 1 -E ffaac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 960 -Y 640 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
+    printf("\n   + iPad:  -e x264  -q 20.0 -r 30 --pfr  -a 1 -E ffaac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
+    printf("\n   + AppleTV:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 960 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1 -x qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n");
+    printf("\n   + AppleTV 2:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
+    printf("\n   + AppleTV 3:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 1920 -Y 1080 --decomb=fast --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 4.0\n");
     printf("\n   + Android:  -e x264  -q 22.0 -r 30 --pfr  -a 1 -E ffaac -B 128 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 720 -Y 576 --loose-anamorphic --modulus 2 --x264-preset medium --h264-profile main --h264-level 3.0\n");
     printf("\n   + Android Tablet:  -e x264  -q 22.0 -r 30 --pfr  -a 1 -E ffaac -B 128 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 --x264-preset medium --h264-profile main --h264-level 3.1\n");
     printf("\n   + Windows Phone 8:  -e x264  -q 22.0 -r 30 --pfr  -a 1 -E ffaac -B 128 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 1280 -Y 720 --modulus 2 --x264-preset medium --h264-profile main --h264-level 3.1\n");
 	printf("\n>\n");
     printf("\n< Regular\n");
     printf("\n   + Normal:  -e x264  -q 20.0 -a 1 -E ffaac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 --loose-anamorphic --modulus 2 -m --x264-preset veryfast --h264-profile main --h264-level 4.0\n");
-    printf("\n   + High Profile:  -e x264  -q 20.0 -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 --decomb --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 4.1\n");
+    printf("\n   + High Profile:  -e x264  -q 20.0 -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 --decomb --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 4.1\n");
     printf("\n>\n");
 }
 
diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
index dde18c292..56b6c93e7 100644
--- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
+++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
@@ -9,8 +9,6 @@
         <Grid.RowDefinitions>

             <RowDefinition Height="Auto" />

             <RowDefinition Height="Auto" />

-            <RowDefinition Height="Auto" />

-            <RowDefinition Height="Auto" />

             <RowDefinition Height="*" />

             <RowDefinition Height="Auto" />

         </Grid.RowDefinitions>

@@ -29,38 +27,44 @@
                                 Minimum="0" Maximum="1000" Number="{Binding TitleSpecificScan, Mode=TwoWay}" />

             </StackPanel>

 

-            <TextBlock Text="Then choose your source: " Margin="0,10,0,0" />

+            <TextBlock Text="Then choose the video(s) you'd like to encode: " Margin="0,10,0,0" />

         </StackPanel>

 

         <!-- Source Type -->

-        <StackPanel Grid.Row="2" Orientation="Vertical" HorizontalAlignment="Left" Margin="5,5,0,0">

+        <Grid Grid.Row="2" HorizontalAlignment="Left" Margin="5,5,0,0">

+            

+            <Grid.RowDefinitions>

+                <RowDefinition Height="Auto" />

+                <RowDefinition Height="Auto" />

+                <RowDefinition Height="*" />

+            </Grid.RowDefinitions>

 

             <!-- Ctrl + R -->

-            <Button  AutomationProperties.Name="Choose Folder to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FolderScan]"

+            <Button Grid.Row="0"  AutomationProperties.Name="Choose Folder to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FolderScan]"

                     Margin="0,0,0,7" Padding="8" HorizontalAlignment="Left">

                

                 <StackPanel Orientation="Horizontal" MinWidth="100">

                     <Image Source="../Views/Images/folder32.png" Width="32" />

                     <StackPanel Orientation="Vertical">

                         <TextBlock Text="Folder" VerticalAlignment="Center" Margin="5,0,0,0" />

-                        <TextBlock Text="Open a VIDEO_TS folder or a batch of files" VerticalAlignment="Center" Margin="5,0,0,0" />

+                        <TextBlock Text="Open a folder with one or more files." VerticalAlignment="Center" Margin="5,0,0,0" />

                     </StackPanel>                   

                 </StackPanel>

             </Button>

 

             <!--Ctrl + F-->

-            <Button AutomationProperties.Name="Choose File to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FileScan]"

+            <Button Grid.Row="1"  AutomationProperties.Name="Choose File to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FileScan]"

                     Margin="0,0,0,7" Padding="8" HorizontalAlignment="Left">

                 <StackPanel Orientation="Horizontal" MinWidth="100">

                     <Image Source="../Views/Images/File32.png" Width="32" />

                     <StackPanel Orientation="Vertical">

                         <TextBlock Text="File" VerticalAlignment="Center" Margin="5,0,0,0" />

-                        <TextBlock Text="Open a single file." VerticalAlignment="Center" Margin="5,0,0,0" />

+                        <TextBlock Text="Open a single video file." VerticalAlignment="Center" Margin="5,0,0,0" />

                     </StackPanel>

                 </StackPanel>

             </Button>

-            

-            <ListBox ItemsSource="{Binding Drives}" Background="Transparent"  BorderThickness="0">

+

+            <ListBox Grid.Row="2" ItemsSource="{Binding Drives}" Background="Transparent"  BorderThickness="0">

                 <ListBox.ItemTemplate>

                     <DataTemplate>

                         <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" 

@@ -79,7 +83,7 @@
                 </ListBox.ItemTemplate>

                 

             </ListBox>

-        </StackPanel>

+        </Grid>

 

         <!-- Cancel Window -->

         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,10,10">

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
index e08d2d9ff..fba717b4c 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
@@ -9,6 +9,8 @@
 

 namespace HandBrakeWPF.ViewModels.Interfaces

 {

+    using System.Windows;

+

     using HandBrake.ApplicationServices.Model;

 

     /// <summary>

@@ -92,5 +94,13 @@ namespace HandBrakeWPF.ViewModels.Interfaces
         /// The show cli query.

         /// </summary>

         void ShowCliQuery();

+

+        /// <summary>

+        /// The files dropped on window.

+        /// </summary>

+        /// <param name="e">

+        /// The e.

+        /// </param>

+        void FilesDroppedOnWindow(DragEventArgs e);

     }

 }
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
index ef32eb205..10c82f1a4 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
@@ -9,6 +9,8 @@
 

 namespace HandBrakeWPF.ViewModels

 {

+    using System.IO;

+    using System.Linq;

     using System.Windows;

 

     using Caliburn.Micro;

@@ -186,6 +188,17 @@ namespace HandBrakeWPF.ViewModels
         #endregion

 

         /// <summary>

+        /// The files dropped on window. Pass this through to the active view model.

+        /// </summary>

+        /// <param name="e">

+        /// The DragEventArgs.

+        /// </param>

+        public void FilesDroppedOnWindow(DragEventArgs e)

+        {

+            this.MainViewModel.FilesDroppedOnWindow(e);

+        }

+

+        /// <summary>

         /// Checks with the use if this window can be closed.

         /// </summary>

         /// <returns>

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 6442e9e45..ad875db87 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -3,9 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

         xmlns:Controls="clr-namespace:HandBrakeWPF.Controls"

         xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"

-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"

-        xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"

-             xmlns:attachedProperties="clr-namespace:HandBrakeWPF.AttachedProperties"

+             xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"

              AllowDrop="True"

         FontSize="11"

         Micro:Message.Attach="[Event Loaded] = [Action Load]"

@@ -13,14 +11,6 @@
         UseLayoutRounding="True"

        >

 

-    <i:Interaction.Triggers>

-        <i:EventTrigger EventName="Drop">

-            <Micro:ActionMessage MethodName="FilesDroppedOnWindow">

-                <Micro:Parameter Value="$eventArgs" />

-            </Micro:ActionMessage>

-        </i:EventTrigger>

-    </i:Interaction.Triggers>

-

     <UserControl.Resources>

         <Converters:BooleanConverter x:Key="booleanConverter" />

         <Converters:EnumComboConverter x:Key="enumComboConverter" />

diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml b/win/CS/HandBrakeWPF/Views/ShellView.xaml
index c9702a7a7..ab82b298a 100644
--- a/win/CS/HandBrakeWPF/Views/ShellView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml
@@ -4,6 +4,8 @@
         xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework"

         xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"

         xmlns:views="clr-namespace:HandBrakeWPF.Views"

+        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"

+        xmlns:cal="http://www.caliburnproject.org"

         Title="{Data:Binding Path=WindowTitle}"

         Width="1015"

         Height="675"

@@ -20,7 +22,15 @@
     <Window.Resources>

         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />

     </Window.Resources>

-    

+

+    <i:Interaction.Triggers>

+        <i:EventTrigger EventName="Drop">

+            <cal:ActionMessage MethodName="FilesDroppedOnWindow">

+                <cal:Parameter Value="$eventArgs" />

+            </cal:ActionMessage>

+        </i:EventTrigger>

+    </i:Interaction.Triggers>

+

     <Grid>

         <ContentControl x:Name="MainViewModel"  Visibility="{Binding ShowMainWindow, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

         <ContentControl x:Name="OptionsViewModel"  Visibility="{Binding ShowOptions, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />