claunia/cuetools.net
1
0
Fork 0
mirror of https://github.com/claunia/cuetools.net.git synced 2025-12-16 18:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

eac3toui is now called BluTools and has improved looks

Browse Source
This commit is contained in:
Grigory Chudov
2018-02-26 21:31:07 -05:00
parent 790b904ec2
commit 39f4792319
30 changed files with 281 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CUETools.eac3ui/App.config
View File

@@ -2,20 +2,20 @@
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="CUETools.eac3ui.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="BluTools.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<userSettings>
<CUETools.eac3ui.Properties.Settings>
<BluTools.Properties.Settings>
<setting name="SourceFolder" serializeAs="String">
<value />
</setting>
<setting name="DestinationFolder" serializeAs="String">
<value />
</setting>
</CUETools.eac3ui.Properties.Settings>
</BluTools.Properties.Settings>
</userSettings>
</configuration>

4
CUETools.eac3ui/App.xaml
View File

@@ -1,7 +1,7 @@
<Application x:Class="CUETools.eac3ui.App"
<Application x:Class="BluTools.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:CUETools.eac3ui"
xmlns:local="clr-namespace:BluTools"
StartupUri="MainWindow.xaml">
<Application.Resources>

2
CUETools.eac3ui/App.xaml.cs
View File

@@ -6,7 +6,7 @@ using System.Linq;
using System.Threading.Tasks;
using System.Windows;
namespace CUETools.eac3ui
namespace BluTools
{
/// <summary>
/// Interaction logic for App.xaml

57
CUETools.eac3ui/CUETools.eac3ui.csproj → CUETools.eac3ui/BLUTools.csproj
View File

@@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{678875A6-6B3A-4AAC-83B6-D9A72D9016CF}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>CUETools.eac3ui</RootNamespace>
<AssemblyName>CUETools.eac3ui</AssemblyName>
<RootNamespace>BluTools</RootNamespace>
<AssemblyName>BluTools</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -36,6 +36,7 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
@@ -85,6 +86,7 @@
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
@@ -120,5 +122,56 @@
<Name>CUETools.Processor</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\freedb16.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\musicbrainz.ico" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\discogs.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\icons8-audio-wave-32.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\icons8-dolby-digital-32.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\headphones-box.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\icons8-copy-48.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\icons8-export-48.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\icons8-import-48.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\icons8-open-48.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\icons8-playlist-48.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\icons8-tags-48.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\icons8-musical-notes-48.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\icons8-cancel-48.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\ic_surround_sound_black_48dp_1x.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\icons8-dts-48.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\cue2.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

BIN
CUETools.eac3ui/Icons/cue2.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
CUETools.eac3ui/Icons/discogs.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 424 B

BIN
CUETools.eac3ui/Icons/freedb16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 394 B

BIN
CUETools.eac3ui/Icons/headphones-box.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 765 B

BIN
CUETools.eac3ui/Icons/ic_surround_sound_black_48dp_1x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 570 B

BIN
CUETools.eac3ui/Icons/icons8-audio-wave-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 250 B

BIN
CUETools.eac3ui/Icons/icons8-cancel-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 731 B

BIN
CUETools.eac3ui/Icons/icons8-copy-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 357 B

BIN
CUETools.eac3ui/Icons/icons8-dolby-digital-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 371 B

BIN
CUETools.eac3ui/Icons/icons8-dts-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 698 B

BIN
CUETools.eac3ui/Icons/icons8-export-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 436 B

BIN
CUETools.eac3ui/Icons/icons8-import-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 439 B

BIN
CUETools.eac3ui/Icons/icons8-musical-notes-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 539 B

BIN
CUETools.eac3ui/Icons/icons8-open-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 435 B

BIN
CUETools.eac3ui/Icons/icons8-playlist-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 451 B

BIN
CUETools.eac3ui/Icons/icons8-tags-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 711 B

BIN
CUETools.eac3ui/Icons/musicbrainz.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

101
CUETools.eac3ui/MainWindow.xaml
View File

@@ -1,31 +1,67 @@
<Window x:Class="CUETools.eac3ui.MainWindow"
<Window x:Class="BluTools.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:CUETools.eac3ui"
xmlns:local="clr-namespace:BluTools"
mc:Ignorable="d"
MinWidth="300" MaxWidth="1200" MinHeight="300" MaxHeight="300"
Title="CUETools eac3to" Height="300" Width="600" Closing="Window_Closing" Initialized="Window_Initialized">
MinWidth="300" MaxWidth="1200" MinHeight="260" MaxHeight="300"
DataContext="{Binding RelativeSource={RelativeSource Self}}"
Icon="Icons/cue2.ico"
Title="BluTools" Height="260" Width="600" Closing="Window_Closing" Initialized="Window_Initialized">
<Window.Resources>
<local:CodingTypeToIcon x:Key="CodingTypeToIcon" />
<local:FormatTypeToIcon x:Key="FormatTypeToIcon" />
<local:MetadataSourceToIcon x:Key="MetadataSourceToIcon" />
<!--<Canvas x:Key="canvas_dolby" Width="24" Height="24">
<Path Stroke="Black" Fill="Gray" Data="M2,5V19H22V5H2M6,17H4V7H6C8.86,7.09 11.1,9.33 11,12C11.1,14.67 8.86,16.91 6,17M20,17H18C15.14,16.91 12.9,14.67 13,12C12.9,9.33 15.14,7.09 18,7H20V17Z" />
</Canvas>-->
<!--PCM-->
<Image x:Key="coding_type_128" Source="/BluTools;component/Icons/icons8-audio-wave-32.png"></Image>
<!--AC3-->
<Image x:Key="coding_type_129" Source="/BluTools;component/Icons/icons8-dolby-digital-32.png"></Image>
<!--DTS-->
<Image x:Key="coding_type_130" Source="/BluTools;component/Icons/icons8-dts-48.png"></Image>
<!--Dolby TrueHD-->
<Image x:Key="coding_type_131" Source="/BluTools;component/Icons/icons8-dolby-digital-32.png"></Image>
<!--EAC3-->
<Image x:Key="coding_type_132" Source="/BluTools;component/Icons/icons8-dolby-digital-32.png"></Image>
<!--DTSHD-->
<Image x:Key="coding_type_133" Source="/BluTools;component/Icons/icons8-dts-48.png"></Image>
<!--DTSHDMA-->
<Image x:Key="coding_type_134" Source="/BluTools;component/Icons/icons8-dts-48.png"></Image>
<Image x:Key="format_type_3" Source="/BluTools;component/Icons/headphones-box.png"></Image>
<Image x:Key="format_type_6" Source="/BluTools;component/Icons/ic_surround_sound_black_48dp_1x.png"></Image>
<Image x:Key="freedb" Source="/BluTools;component/Icons/freedb16.png"></Image>
<Image x:Key="musicbrainz" Source="/BluTools;component/Icons/musicbrainz.ico"></Image>
<Image x:Key="discogs" Source="/BluTools;component/Icons/discogs.png"></Image>
</Window.Resources>
<StackPanel>
<StackPanel x:Name="stackParams">
<DockPanel>
<Label x:Name="labelSource" Content="Source" Margin="8" Width="80"/>
<Button x:Name="buttonBrowseSource" Content="Browse" Click="ButtonBrowseSource_Click" DockPanel.Dock="Right" Margin="8"/>
<TextBox x:Name="textBoxSource" TextWrapping="NoWrap" Margin="8" TextChanged="textBoxSource_TextChanged"/>
<Image Source="/BluTools;component/Icons/icons8-import-48.png" Height="24 " Width="24" Margin="10,5" ToolTip="Source"/>
<Button x:Name="buttonBrowseSource" Click="ButtonBrowseSource_Click" DockPanel.Dock="Right" Margin="10,5" ToolTip="Browse">
<Image Source="/BluTools;component/Icons/icons8-open-48.png" Width="24" />
</Button>
<TextBox x:Name="textBoxSource" TextWrapping="NoWrap" Margin="10,5" TextChanged="textBoxSource_TextChanged"/>
</DockPanel>
<DockPanel>
<Label x:Name="labelDestination" Content="Destination" Margin="8" Width="80"/>
<Button x:Name="buttonBrowseDestination" Content="Browse" Click="buttonBrowseDestination_Click" DockPanel.Dock="Right" Margin="8"/>
<TextBox x:Name="textBoxDestination" TextWrapping="NoWrap" Margin="8"/>
<Image Source="/BluTools;component/Icons/icons8-export-48.png" Height="24 " Width="24" Margin="10,5" ToolTip="Destination"/>
<Button x:Name="buttonBrowseDestination" Click="buttonBrowseDestination_Click" DockPanel.Dock="Right" Margin="10,5" ToolTip="Browse">
<Image Source="/BluTools;component/Icons/icons8-open-48.png" Width="24" />
</Button>
<TextBox x:Name="textBoxDestination" TextWrapping="NoWrap" Margin="10,5"/>
</DockPanel>
<DockPanel>
<Label x:Name="labelTitleSet" Content="Title Set" Margin="8" Width="80"/>
<ComboBox x:Name="cmbTitleSet" Margin="8" SelectionChanged="cmbTitleSet_SelectionChanged">
<Image Source="/BluTools;component/Icons/icons8-playlist-48.png" Height="24 " Width="24" Margin="10,5" ToolTip="Title Set"/>
<ComboBox x:Name="cmbTitleSet" Margin="10,5" SelectionChanged="cmbTitleSet_SelectionChanged">
<ComboBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<Rectangle Fill="{Binding Name}" Width="16" Height="16" Margin="0,2,5,2" />
<TextBlock Text="{Binding FileName}" Margin="10,0" />
<TextBlock Text="{Binding Duration, StringFormat={}({0:hh\\:mm\\:ss})}" />
<TextBlock Text="{Binding Chapters.Count, StringFormat={}{0,2} chapters}" Margin="10,0" />
@@ -35,31 +71,32 @@
</ComboBox>
</DockPanel>
<DockPanel>
<Label x:Name="labelAudioTrack" Content="Audio Track" Margin="8" Width="80"/>
<ComboBox x:Name="cmbAudioTrack" Margin="8" SelectionChanged="cmbAudioTrack_SelectionChanged">
<Image Source="/BluTools;component/Icons/icons8-musical-notes-48.png" Height="24 " Width="24" Margin="10,5" ToolTip="Audio"/>
<ComboBox x:Name="cmbAudioTrack" Margin="10,5" SelectionChanged="cmbAudioTrack_SelectionChanged">
<ComboBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<Rectangle Fill="{Binding Name}" Width="16" Height="16" Margin="0,2,5,2" />
<TextBlock Text="{Binding CodecString}" Margin="10,0" />
<TextBlock Text="{Binding LanguageString}" Margin="10,0" />
<TextBlock Text="{Binding FormatString}" Margin="10,0" />
<TextBlock Text="{Binding RateString}" Margin="10,0" />
<Image Source="{Binding FormatType, Converter={StaticResource FormatTypeToIcon}}" Margin="1,1,5,1" Width="16" Height="16"></Image>
<Image Source="{Binding CodingType, Converter={StaticResource CodingTypeToIcon}}" Margin="1,1,5,1" Width="16" Height="16"></Image>
<TextBlock Text="{Binding LanguageString}" Margin="5,0" />
<TextBlock Text="{Binding RateString}" Margin="5,0" />
<TextBlock Text="{Binding CodecString}" Margin="5,0" />
</StackPanel>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</DockPanel>
<DockPanel>
<Label x:Name="labelMetadata" Content="Metadata" Margin="8" Width="80"/>
<ComboBox x:Name="cmbMetadata" Margin="8">
<Image Source="/BluTools;component/Icons/icons8-tags-48.png" Height="24 " Width="24" Margin="10,5" ToolTip="Metadata"/>
<ComboBox x:Name="cmbMetadata" Margin="10,5">
<ComboBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<Rectangle Fill="{Binding source}" Width="16" Height="16" Margin="0,2,5,2" />
<TextBlock Text="{Binding artist}" Margin="10,0" />
<TextBlock Text="{Binding year}" Margin="10,0" />
<TextBlock Text="{Binding album}" Margin="10,0" />
<Image Source="{Binding ImageKey, Converter={StaticResource MetadataSourceToIcon}}" Width="Auto" Margin="1,1,5,1" MinWidth="16" MinHeight="16"></Image>
<!--<TextBlock Text="{Binding metadata.Artist}" Margin="10,0" />
<TextBlock Text="{Binding metadata.Year}" Margin="10,0" />
<TextBlock Text="{Binding metadata.Title}" Margin="10,0" />-->
<TextBlock Text="{Binding}" Margin="5,0" />
</StackPanel>
</DataTemplate>
</ComboBox.ItemTemplate>
@@ -67,9 +104,15 @@
</DockPanel>
</StackPanel>
<DockPanel>
<Button x:Name="buttonStop" Content="Stop" DockPanel.Dock="Left" Margin="8" Click="buttonStop_Click" Visibility="Hidden" Width="80"/>
<Button x:Name="buttonExtract" Content="Extract" DockPanel.Dock="Right" Margin="8" Click="buttonExtract_Click"/>
<ProgressBar Minimum="0" Maximum="100" Name="pbStatus" Margin="8" Visibility="Collapsed"/>
<Grid Margin="10,5" >
<Button x:Name="buttonStop" Click="buttonStop_Click" Visibility="Hidden" Margin="0" ToolTip="Cancel">
<Image Source="/BluTools;component/Icons/icons8-cancel-48.png" Width="24" />
</Button>
<Button x:Name="buttonExtract" Click="buttonExtract_Click" Margin="0" ToolTip="Copy">
<Image Source="/BluTools;component/Icons/icons8-copy-48.png" Width="24" />
</Button>
</Grid>
<ProgressBar Minimum="0" Maximum="100" Name="pbStatus" Margin="10,5" Visibility="Collapsed"/>
</DockPanel>
</StackPanel>
</Window>

91
CUETools.eac3ui/MainWindow.xaml.cs
View File

@@ -20,9 +20,11 @@ using System.ComponentModel;
using Krystalware.UploadHelper;
using CUETools.Codecs;
using CUETools.Codecs.FLAKE;
using CUETools.Processor;
using System.Collections.ObjectModel;
//using Microsoft.Win32;
namespace CUETools.eac3ui
namespace BluTools
{
/// <summary>
/// Interaction logic for MainWindow.xaml
@@ -31,6 +33,7 @@ namespace CUETools.eac3ui
{
public MainWindow()
{
metaresults = new ObservableCollection<CUEMetadataEntry>();
filterShort = 900;
filterRepeats = 2;
filterDups = true;
@@ -158,9 +161,19 @@ namespace CUETools.eac3ui
ctdb.ContactDB(null, "CUETools.eac3to 2.1.7", "", false, true, CTDBMetadataSearch.Extensive);
this.Dispatcher.Invoke(() =>
{
//metaresults.RaiseListChangedEvents = false;
cmbMetadata.ItemsSource = null;
metaresults.Clear();
foreach (var m in ctdb.Metadata)
{
var entry = new CUEMetadataEntry(ctdb.TOC, m.source);
entry.metadata.FillFromCtdb(m, entry.TOC.FirstAudio - 1);
metaresults.Add(entry);
}
//metaresults.RaiseListChangedEvents = true;
cmbMetadata.ItemsSource = metaresults;
pbStatus.Visibility = Visibility.Collapsed;
pbStatus.IsIndeterminate = false;
cmbMetadata.ItemsSource = ctdb.Metadata;
cmbMetadata.SelectedIndex = 0;
});
}
@@ -185,7 +198,8 @@ namespace CUETools.eac3ui
CUEToolsDB ctdb;
BackgroundWorker workerExtract;
CTDBResponseMeta meta;
CUEMetadataEntry metaresult;
ObservableCollection<CUEMetadataEntry> metaresults;
MPLSReader chosenReader;
ushort pid;
string outputFolderPath;
@@ -201,11 +215,11 @@ namespace CUETools.eac3ui
if (cmbTitleSet.SelectedItem == null) return;
pid = ((MPLSStream)cmbAudioTrack.SelectedItem).pid;
chosenReader = cmbTitleSet.SelectedItem as MPLSReader;
meta = cmbMetadata.SelectedItem as CTDBResponseMeta;
outputFolderPath = Path.Combine(textBoxDestination.Text, meta != null ?
meta.artist + " - " + meta.year + " - " + meta.album :
metaresult = cmbMetadata.SelectedItem as CUEMetadataEntry;
outputFolderPath = Path.Combine(textBoxDestination.Text, metaresult != null ?
metaresult.metadata.Artist + " - " + metaresult.metadata.Year + " - " + metaresult.metadata.Title :
Path.GetFileName(textBoxSource.Text) + "." + chosenReader.FileName + "." + pid.ToString());
outputAudioPath = Path.Combine(outputFolderPath, meta != null ? meta.artist + " - " + meta.year + " - " + meta.album + ".flac" : "image.flac");
outputAudioPath = Path.Combine(outputFolderPath, metaresult != null ? metaresult.metadata.Artist + " - " + metaresult.metadata.Year + " - " + metaresult.metadata.Title + ".flac" : "image.flac");
outputCuePath = Path.ChangeExtension(outputAudioPath, "cue");
pbStatus.Visibility = Visibility.Visible;
@@ -213,6 +227,7 @@ namespace CUETools.eac3ui
//pbStatus.IsIndeterminate = true;
stackParams.IsEnabled = false;
buttonExtract.IsEnabled = false;
buttonExtract.Visibility = Visibility.Hidden;
buttonStop.Visibility = Visibility.Visible;
buttonStop.IsEnabled = true;
@@ -243,14 +258,14 @@ namespace CUETools.eac3ui
using (StreamWriter cueWriter = new StreamWriter(outputCuePath, false, Encoding.UTF8))
{
cueWriter.WriteLine("REM COMMENT \"{0}\"", "Created by CUETools.eac3to");
if (meta != null && meta.year != null)
cueWriter.WriteLine("REM DATE {0}", meta.year);
if (metaresult != null && metaresult.metadata.Year != "")
cueWriter.WriteLine("REM DATE {0}", metaresult.metadata.Year);
else
cueWriter.WriteLine("REM DATE XXXX");
if (meta != null)
if (metaresult != null)
{
cueWriter.WriteLine("PERFORMER \"{0}\"", meta.artist);
cueWriter.WriteLine("TITLE \"{0}\"", meta.album);
cueWriter.WriteLine("PERFORMER \"{0}\"", metaresult.metadata.Artist);
cueWriter.WriteLine("TITLE \"{0}\"", metaresult.metadata.Title);
}
else
{
@@ -263,11 +278,11 @@ namespace CUETools.eac3ui
if (toc[track].IsAudio)
{
cueWriter.WriteLine(" TRACK {0:00} AUDIO", toc[track].Number);
if (meta != null && meta.track.Length >= toc[track].Number)
if (metaresult != null && metaresult.metadata.Tracks.Count >= toc[track].Number)
{
cueWriter.WriteLine(" TITLE \"{0}\"", meta.track[(int)toc[track].Number - 1].name);
if (meta.track[(int)toc[track].Number - 1].artist != null)
cueWriter.WriteLine(" PERFORMER \"{0}\"", meta.track[(int)toc[track].Number - 1].artist);
cueWriter.WriteLine(" TITLE \"{0}\"", metaresult.metadata.Tracks[(int)toc[track].Number - 1].Title);
if (metaresult.metadata.Tracks[(int)toc[track].Number - 1].Artist != "")
cueWriter.WriteLine(" PERFORMER \"{0}\"", metaresult.metadata.Tracks[(int)toc[track].Number - 1].Artist);
}
else
{
@@ -330,6 +345,7 @@ namespace CUETools.eac3ui
//pbStatus.IsIndeterminate = false;
stackParams.IsEnabled = true;
buttonExtract.IsEnabled = true;
buttonExtract.Visibility = Visibility.Visible;
buttonStop.Visibility = Visibility.Hidden;
buttonStop.IsEnabled = false;
});
@@ -346,6 +362,49 @@ namespace CUETools.eac3ui
{
textBoxSource.Text = Properties.Settings.Default.SourceFolder;
textBoxDestination.Text = Properties.Settings.Default.DestinationFolder;
cmbMetadata.ItemsSource = metaresults;
}
}
public class CodingTypeToIcon : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
// TODO: ResourceDictionary?
var image = Application.Current.MainWindow.Resources["coding_type_" + value.ToString()] as Image;
return image == null ? null : image.Source;
}
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
return null;
}
}
public class FormatTypeToIcon : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
var image = Application.Current.MainWindow.Resources["format_type_" + value.ToString()] as Image;
return image == null ? null : image.Source;
}
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
return null;
}
}
public class MetadataSourceToIcon : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
var image = Application.Current.MainWindow.Resources[value.ToString()] as Image;
return image == null ? null : image.Source;
}
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
return null;
}
}
}

4
CUETools.eac3ui/Properties/AssemblyInfo.cs
View File

@@ -7,11 +7,11 @@ using System.Windows;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("CUETools.eac3ui")]
[assembly: AssemblyTitle("BluTools")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CUETools.eac3ui")]
[assembly: AssemblyProduct("BluTools")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

46
CUETools.eac3ui/Properties/Resources.Designer.cs generated
View File

@@ -8,10 +8,10 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace CUETools.eac3ui.Properties
{
namespace BluTools.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
@@ -19,51 +19,43 @@ namespace CUETools.eac3ui.Properties
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources
{
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources()
{
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager
{
get
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CUETools.eac3ui.Properties.Resources", typeof(Resources).Assembly);
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BluTools.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
{
get
{
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set
{
set {
resourceCulture = value;
}
}

14
CUETools.eac3ui/Properties/Resources.resx
View File

@@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
@@ -85,9 +87,10 @@
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
@@ -109,9 +112,10 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</root>

2
CUETools.eac3ui/Properties/Settings.Designer.cs generated
View File

@@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace CUETools.eac3ui.Properties {
namespace BluTools.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

2
CUETools.eac3ui/Properties/Settings.settings
View File

@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="CUETools.eac3ui.Properties" GeneratedClassName="Settings">
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="BluTools.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings>
<Setting Name="SourceFolder" Type="System.String" Scope="User">