Skip to content

Added alac support #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UniversalThrowawayaccount wants to merge 1 commit into
base: integration
Choose a base branch
from
Open

Added alac support #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,17 @@ protected virtual void FillFFMpegArgumentsList()
}

break;
case OutputType.m4a:
{
string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
//https://stackoverflow.com/questions/62486428/using-ffmpeg-to-convert-flac-to-alac-with-cover-art
string encoderArgs = $"-c:a alac -c:v copy {channelArgs}";

string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);

this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
}
break;

case OutputType.Avi:
{
Expand Down
5 changes: 5 additions & 0 deletions Application/FileConverter/ConversionPreset/ConversionPreset.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,11 @@ private void InitializeDefaultSettings(OutputType outputType)
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableFFMPEGCustomCommand, "False");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.FFMPEGCustomCommand, string.Empty);
break;
case OutputType.m4a:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableFFMPEGCustomCommand, "False");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.FFMPEGCustomCommand, string.Empty);
break;

case OutputType.Flac:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0");
Expand Down
8 changes: 6 additions & 2 deletions Application/FileConverter/FileConverter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,13 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.ar-EG.resx" />
<EmbeddedResource Include="Properties\Resources.ar-EG.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.cs-CZ.resx" />
<EmbeddedResource Include="Properties\Resources.de-DE.resx" />
<EmbeddedResource Include="Properties\Resources.de-DE.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.fa-IR.resx" />
<EmbeddedResource Include="Properties\Resources.he-IL.resx" />
<EmbeddedResource Include="Properties\Resources.hi-IN.resx" />
Expand Down
1 change: 1 addition & 0 deletions Application/FileConverter/Helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ public static bool IsOutputTypeCompatibleWithCategory(OutputType outputType, str
switch (outputType)
{
case OutputType.Aac:
case OutputType.m4a:
case OutputType.Flac:
case OutputType.Mp3:
case OutputType.Ogg:
Expand Down
1 change: 1 addition & 0 deletions Application/FileConverter/OutputType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public enum OutputType
None,

Aac,
m4a,
Avi,
Flac,
Gif,
Expand Down
37 changes: 37 additions & 0 deletions Application/FileConverter/Settings.default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@
</ConversionPreset>
<ConversionPreset Name="To Aac" OutputType="Aac" IsDefaultSettings="true">
<InputTypes>3gp</InputTypes>
<InputTypes>Alac</InputTypes>
<InputTypes>3gpp</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
Expand Down Expand Up @@ -419,6 +420,42 @@
<Settings Key="FFMPEGCustomCommand" Value="" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="To Alac" OutputType="m4a" IsDefaultSettings="true">
<InputTypes>3gp</InputTypes>
<InputTypes>3gpp</InputTypes>
<InputTypes>Aac</InputTypes>
<InputTypes>avi</InputTypes>
<InputTypes>bik</InputTypes>
<InputTypes>flv</InputTypes>
<InputTypes>m4v</InputTypes>
<InputTypes>mkv</InputTypes>
<InputTypes>mov</InputTypes>
<InputTypes>mp4</InputTypes>
<InputTypes>mpg</InputTypes>
<InputTypes>mpeg</InputTypes>
<InputTypes>ogv</InputTypes>
<InputTypes>rm</InputTypes>
<InputTypes>ts</InputTypes>
<InputTypes>webm</InputTypes>
<InputTypes>wmv</InputTypes>
<InputTypes>aac</InputTypes>
<InputTypes>aiff</InputTypes>
<InputTypes>ape</InputTypes>
<InputTypes>flac</InputTypes>
<InputTypes>m4a</InputTypes>
<InputTypes>m4b</InputTypes>
<InputTypes>mp3</InputTypes>
<InputTypes>oga</InputTypes>
<InputTypes>ogg</InputTypes>
<InputTypes>opus</InputTypes>
<InputTypes>wav</InputTypes>
<InputTypes>wma</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
<Settings Key="AudioChannelCount" Value="0" />
<Settings Key="EnableFFMPEGCustomCommand" Value="False" />
<Settings Key="FFMPEGCustomCommand" Value="" />
<OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
</ConversionPreset>
<ConversionPreset Name="Extract DVD to Mp4" OutputType="Mp4" IsDefaultSettings="true">
<InputTypes>vob</InputTypes>
<InputPostConversionAction>None</InputPostConversionAction>
Expand Down
1 change: 1 addition & 0 deletions Application/FileConverter/ViewModels/SettingsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public SettingsViewModel()
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Ogg));
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Mp3));
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Aac));
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.m4a));
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Flac));
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Wav));
outputTypeViewModels.Add(new OutputTypeViewModel(OutputType.Mkv));
Expand Down
22 changes: 22 additions & 0 deletions Application/FileConverter/Views/Resources/ConversionPresetTemplates.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,25 @@
</Grid>
</DataTemplate>

<DataTemplate x:Key="AlacSettingsDataTemplate" DataType="{x:Type fileConverter:ConversionPreset}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>

<Label Grid.Row="0" Grid.Column="0" Content="{x:Static project:Resources.ChannelCountTitle}" ToolTip="{x:Static project:Resources.ChannelCountTooltip}" />
<DockPanel Grid.Row="0" Grid.Column="1">
<RadioButton Content="{x:Static project:Resources.SameChannelCountOption}" Margin="5" IsChecked="{Binding Settings, ConverterParameter=AudioChannelCount|0, Converter={StaticResource ConversionSettingsEquals}, Mode=TwoWay}" />
<RadioButton Content="{x:Static project:Resources.MonoOption}" Margin="5" IsChecked="{Binding Settings, ConverterParameter=AudioChannelCount|1, Converter={StaticResource ConversionSettingsEquals}, Mode=TwoWay}" />
<RadioButton Content="{x:Static project:Resources.StereoOption}" Margin="5" IsChecked="{Binding Settings, ConverterParameter=AudioChannelCount|2, Converter={StaticResource ConversionSettingsEquals}, Mode=TwoWay}" />
</DockPanel>
</Grid>
</DataTemplate>

<DataTemplate x:Key="FlacSettingsDataTemplate" DataType="{x:Type fileConverter:ConversionPreset}">
<Grid>
<Grid.ColumnDefinitions>
Expand Down Expand Up @@ -621,6 +640,9 @@
<DataTrigger Binding="{Binding OutputType}" Value="Aac">
<Setter Property="ContentTemplate" Value="{StaticResource AacSettingsDataTemplate}"/>
</DataTrigger>
<DataTrigger Binding="{Binding OutputType}" Value="Alac">
<Setter Property="ContentTemplate" Value="{StaticResource AlacSettingsDataTemplate}"/>
</DataTrigger>
<DataTrigger Binding="{Binding OutputType}" Value="Avi">
<Setter Property="ContentTemplate" Value="{StaticResource AviSettingsDataTemplate}"/>
</DataTrigger>
Expand Down