Permalink
Browse files

Merge branch 'master' into FEAT-3936-Add_support_for_post_processing_…

…filters_in_native_Blu-ray_playback

Conflicts:
	mediaportal/Configuration/MediaPortal.Configuration.csproj
	mediaportal/Core/Player/g_player.cs
  • Loading branch information...
2 parents 8399c5c + 4f428ae commit e724fd4a237387e25b8f69e77f57c1086c22b802 @Sebastiii Sebastiii committed Apr 18, 2013
Showing with 12,301 additions and 10,117 deletions.
  1. +28 −0 Tools/MediaPortal.DeployTool/InstallationChecks/MediaPortalChecker.cs
  2. +3 −0 Tools/MediaPortal.DeployTool/MediaPortal.DeployTool.resx
  3. +3 −0 Tools/MediaPortal.DeployTool/Sections/SkinChoice.cs
  4. +5 −5 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Mendip.xml
  5. +10 −10 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Winter Hill.xml
  6. +3 −10 mediaportal/Configuration/MediaPortal.Configuration.csproj
  7. +23 −22 mediaportal/Configuration/Sections/BaseFileExtensions.Designer.cs
  8. +14 −11 mediaportal/Configuration/Sections/BaseFileExtensions.cs
  9. +1,451 −0 mediaportal/Configuration/Sections/Music.Designer.cs
  10. +469 −1,091 mediaportal/Configuration/Sections/Music.cs
  11. +0 −180 mediaportal/Configuration/Sections/MusicASIO.Designer.cs
  12. +0 −234 mediaportal/Configuration/Sections/MusicASIO.cs
  13. +0 −120 mediaportal/Configuration/Sections/MusicASIO.resx
  14. +2 −1 mediaportal/Configuration/Sections/MusicDSP.cs
  15. +0 −2 mediaportal/Configuration/SettingsForm.cs
  16. +4 −0 mediaportal/Configuration/SettingsUpgradeManager.cs
  17. +9 −3 mediaportal/Core/Core.csproj
  18. +0 −3,405 mediaportal/Core/MusicPlayer/BASS/BassAudio.cs
  19. +2,377 −0 mediaportal/Core/MusicPlayer/BASS/BassAudioEngine.cs
  20. +183 −0 mediaportal/Core/MusicPlayer/BASS/BassMusicPlayer.cs
  21. +460 −0 mediaportal/Core/MusicPlayer/BASS/Config.cs
  22. +115 −0 mediaportal/Core/MusicPlayer/BASS/Enums.cs
  23. +645 −0 mediaportal/Core/MusicPlayer/BASS/MixerStream.cs
  24. +988 −0 mediaportal/Core/MusicPlayer/BASS/MusicStream.cs
  25. +126 −126 mediaportal/Core/MusicPlayer/BASS/StreamCopy.cs
  26. +147 −0 mediaportal/Core/MusicPlayer/BASS/Utils.cs
  27. +9 −1 mediaportal/Core/MusicPlayer/Visualization/SoniqueViz.cs
  28. +1 −0 mediaportal/Core/MusicPlayer/Visualization/SoundSpectrumViz.cs
  29. +3 −2 mediaportal/Core/MusicPlayer/Visualization/VisualizationBase.cs
  30. +12 −8 mediaportal/Core/MusicPlayer/Visualization/VisualizationManager.cs
  31. +3 −0 mediaportal/Core/MusicPlayer/Visualization/VisualizationWindow.Designer.cs
  32. +22 −18 mediaportal/Core/MusicPlayer/Visualization/VisualizationWindow.cs
  33. +67 −34 mediaportal/Core/MusicPlayer/Visualization/WinampViz.cs
  34. +27 −21 mediaportal/Core/PlayList/PlayListPlayer.cs
  35. +7 −6 mediaportal/Core/Player/PlayerFactory.cs
  36. +3 −2 mediaportal/Core/Player/g_player.cs
  37. +36 −0 mediaportal/Core/TagReader/MusicTag.cs
  38. +4 −5 mediaportal/Core/TagReader/TagReader.cs
  39. +4,724 −4,690 mediaportal/Core/Util/Util.cs
  40. +24 −0 mediaportal/Databases/Music/MusicDatabase.Updates.cs
  41. +124 −96 mediaportal/MediaPortal.Application/MediaPortal.cs
  42. BIN mediaportal/MediaPortal.Base/Bass.Net.dll
  43. BIN mediaportal/MediaPortal.Base/BassRegistration.dll
  44. BIN mediaportal/MediaPortal.Base/BassVisAPI.Net.dll
  45. BIN mediaportal/MediaPortal.Base/MusicPlayer/plugins/audio decoders/bass_aac.dll
  46. BIN mediaportal/MediaPortal.Base/MusicPlayer/plugins/audio decoders/bass_alac.dll
  47. BIN mediaportal/MediaPortal.Base/MusicPlayer/plugins/audio decoders/bass_ofr.dll
  48. BIN mediaportal/MediaPortal.Base/MusicPlayer/plugins/audio decoders/bass_spx.dll
  49. BIN mediaportal/MediaPortal.Base/MusicPlayer/plugins/audio decoders/bass_tta.dll
  50. BIN mediaportal/MediaPortal.Base/MusicPlayer/plugins/audio decoders/basscd.dll
  51. BIN mediaportal/MediaPortal.Base/MusicPlayer/plugins/audio decoders/bassopus.dll
  52. BIN mediaportal/MediaPortal.Base/MusicPlayer/plugins/audio decoders/basswv.dll
  53. BIN mediaportal/MediaPortal.Base/OptimFROG.dll
  54. BIN mediaportal/MediaPortal.Base/bass.dll
  55. BIN mediaportal/MediaPortal.Base/bass_fx.dll
  56. BIN mediaportal/MediaPortal.Base/bass_vis.dll
  57. BIN mediaportal/MediaPortal.Base/bassasio.dll
  58. BIN mediaportal/MediaPortal.Base/bassmix.dll
  59. BIN mediaportal/MediaPortal.Base/basswasapi.dll
  60. BIN mediaportal/MediaPortal.Base/taglib-sharp.dll
  61. +170 −14 mediaportal/WindowPlugins/GUIMusic/GUIMusicBaseWindow.cs
@@ -50,6 +50,34 @@ public bool Install()
return false;
}
+ // If we have a deploy.xml left over from previous installation then attempt to delete it
+ var deployXml = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) +
+ @"\Team MediaPortal\MediaPortal\deploy.xml";
+ if (File.Exists(deployXml))
+ {
+ try
+ {
+ File.Delete(deployXml);
+ }
+ catch (Exception ex)
+ {
+ var result = MessageBox.Show(Localizer.GetBestTranslation("MainWindow_AppName"),
+ Localizer.GetBestTranslation("DeployXmlDelete_Failed"),
+ MessageBoxButtons.AbortRetryIgnore,
+ MessageBoxIcon.Error);
+ switch (result)
+ {
+ case DialogResult.Abort:
+ Environment.Exit(-2);
+ break;
+ case DialogResult.Ignore:
+ break;
+ case DialogResult.Retry:
+ return Install();
+ }
+ }
+ }
+
//if user has chosen a skin then update deploy.xml so this is picked up by MP
//if no skin has been chosed (user has selected one click install) then set one
var chosenSkin = InstallationProperties.Instance.Get("ChosenSkin");
@@ -534,4 +534,7 @@ Please proceed with it before continuing with MediaPortal installation.</value>
<data name="ExtensionChoice_Title" xml:space="preserve">
<value>Recommended Extensions</value>
</data>
+ <data name="DeployXmlDelete_Failed" xml:space="preserve">
+ <value>Unable to delete deploy.xml\nDo you want to continue?\nSettings may not be upgraded correctly</value>
+ </data>
</root>
@@ -39,6 +39,7 @@ public SkinChoice()
lblExisting.Visible = true;
btnExisting.Image = Images.Choose_button_on;
pbSkin.Image = null;
+ InstallationProperties.Instance.Set("ChosenSkin", "[Existing]");
}
else
{
@@ -50,11 +51,13 @@ public SkinChoice()
{ // default to Titan
btnTitan.Image = Images.Choose_button_on;
pbSkin.Image = Images.preview_titan;
+ InstallationProperties.Instance.Set("ChosenSkin", "Titan");
}
else
{ // choose 4:3 skin
btnDefault.Image = Images.Choose_button_on;
pbSkin.Image = Images.preview_default;
+ InstallationProperties.Instance.Set("ChosenSkin", "Default");
}
}
@@ -6,27 +6,27 @@
<Offset>167</Offset>
</DVBTTuning>
<DVBTTuning>
- <Frequency>722000</Frequency>
+ <Frequency>698000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
<DVBTTuning>
- <Frequency>738000</Frequency>
+ <Frequency>722000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
<DVBTTuning>
- <Frequency>770000</Frequency>
+ <Frequency>738000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
<DVBTTuning>
- <Frequency>794000</Frequency>
+ <Frequency>754000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
<DVBTTuning>
- <Frequency>754000</Frequency>
+ <Frequency>770000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <DVBTTuning>
- <Frequency>738000</Frequency>
+ <DVBTTuning>
+ <Frequency>698000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
<DVBTTuning>
- <Frequency>746000</Frequency>
+ <Frequency>706000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
- </DVBTTuning>
+ </DVBTTuning>
<DVBTTuning>
- <Frequency>770000</Frequency>
+ <Frequency>738000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
<DVBTTuning>
- <Frequency>762000</Frequency>
+ <Frequency>746000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
- </DVBTTuning>
+ </DVBTTuning>
<DVBTTuning>
- <Frequency>778000</Frequency>
+ <Frequency>762000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
<DVBTTuning>
- <Frequency>794000</Frequency>
+ <Frequency>770000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
<DVBTTuning>
- <Frequency>802000</Frequency>
+ <Frequency>778000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
@@ -282,6 +282,9 @@
<Compile Include="Sections\FiltersPowerDVDDecoder10.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Include="Sections\Music.Designer.cs">
+ <DependentUpon>Music.cs</DependentUpon>
+ </Compile>
<Compile Include="Sections\BDPostProcessing.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -527,12 +530,6 @@
<Compile Include="Sections\General.Designer.cs">
<DependentUpon>General.cs</DependentUpon>
</Compile>
- <Compile Include="Sections\MusicASIO.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Sections\MusicASIO.Designer.cs">
- <DependentUpon>MusicASIO.cs</DependentUpon>
- </Compile>
<Compile Include="Sections\MusicDSP.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -916,10 +913,6 @@
<SubType>Designer</SubType>
<DependentUpon>General.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Sections\MusicASIO.resx">
- <DependentUpon>MusicASIO.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
<EmbeddedResource Include="Sections\MusicDSP.resx">
<DependentUpon>MusicDSP.cs</DependentUpon>
<SubType>Designer</SubType>

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -34,22 +34,25 @@ public string Extensions
{
string extensions = string.Empty;
- foreach (string extension in extensionsListBox.Items)
+ foreach (ListViewItem extension in extensionsListView.Items)
{
if (extensions.Length > 0)
{
extensions += ",";
}
- extensions += extension;
+ extensions += extension.Text;
}
return extensions;
}
set
{
string[] extensions = ((string)value).Split(',');
- extensionsListBox.Items.AddRange(extensions);
+ foreach (var extension in extensions)
+ {
+ extensionsListView.Items.Add(extension);
+ }
}
}
@@ -100,9 +103,9 @@ private void addButton_Click(object sender, EventArgs e)
extension = extension.Replace("*", "");
// Check if we already have new extension in the list
- foreach (var ext in extensionsListBox.Items)
+ foreach (ListViewItem ext in extensionsListView.Items)
{
- if ((string)ext == extension)
+ if (ext.Text == extension)
{
MessageBox.Show("Extension already exist.", "Information", MessageBoxButtons.OK,
MessageBoxIcon.Information);
@@ -113,7 +116,7 @@ private void addButton_Click(object sender, EventArgs e)
}
// Add extension to the list
- extensionsListBox.Items.Add(extension);
+ extensionsListView.Items.Add(extension);
// Clear text
extensionTextBox.Text = string.Empty;
@@ -122,12 +125,12 @@ private void addButton_Click(object sender, EventArgs e)
private void removeButton_Click(object sender, EventArgs e)
{
- int itemsSelected = extensionsListBox.SelectedIndices.Count;
+ int itemsSelected = extensionsListView.SelectedIndices.Count;
// Make sure we have a valid item selected
for (int index = 0; index < itemsSelected; index++)
{
- extensionsListBox.Items.RemoveAt(extensionsListBox.SelectedIndices[0]);
+ extensionsListView.Items.RemoveAt(extensionsListView.SelectedIndices[0]);
}
}
@@ -138,13 +141,13 @@ private void resetButton_Click(object sender, EventArgs e)
"MediaPortal Configuration", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2)
== DialogResult.No) return;
- extensionsListBox.Items.Clear();
+ extensionsListView.Items.Clear();
Extensions = DefaultExtensions;
}
private void extensionsListBox_SelectedIndexChanged(object sender, EventArgs e)
{
- removeButton.Enabled = (extensionsListBox.SelectedItems.Count > 0);
+ removeButton.Enabled = (extensionsListView.SelectedItems.Count > 0);
}
private void extensionTextBox_KeyDown(object sender, KeyEventArgs e)
@@ -160,7 +163,7 @@ private void extensionTextBox_KeyDown(object sender, KeyEventArgs e)
private void extensionsListBox_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode != System.Windows.Forms.Keys.Delete) return;
- if (extensionsListBox.SelectedItems.Count <= 0) return;
+ if (extensionsListView.SelectedItems.Count <= 0) return;
e.Handled = true;
removeButton_Click(null, null);
Oops, something went wrong.

0 comments on commit e724fd4

Please sign in to comment.