|
From: <moi...@us...> - 2007-03-25 20:46:39
|
Revision: 222
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=222&view=rev
Author: moiristo
Date: 2007-03-25 13:46:35 -0700 (Sun, 25 Mar 2007)
Log Message:
-----------
Version 0.8, a standalone version (separated from the ExternalPlayers DLL)
Added README
Modified Paths:
--------------
trunk/plugins/VideoLAN/VideoLanPlugin.cs
Added Paths:
-----------
trunk/plugins/VideoLAN/Properties/
trunk/plugins/VideoLAN/Properties/AssemblyInfo.cs
trunk/plugins/VideoLAN/README.txt
trunk/plugins/VideoLAN/VideoLAN.csproj
trunk/plugins/VideoLAN/VideoLAN.sln
trunk/plugins/VideoLAN/VideoLAN.suo
trunk/plugins/VideoLAN/bin/
trunk/plugins/VideoLAN/bin/AXVLC.dll
trunk/plugins/VideoLAN/bin/AxInterop.AXVLC.dll
Removed Paths:
-------------
trunk/plugins/VideoLAN/VlcControl/
Added: trunk/plugins/VideoLAN/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/VideoLAN/Properties/AssemblyInfo.cs (rev 0)
+++ trunk/plugins/VideoLAN/Properties/AssemblyInfo.cs 2007-03-25 20:46:35 UTC (rev 222)
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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("VideoLAN")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("VideoLAN")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("1d212193-b17a-43da-a2e0-9af68a029598")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
Added: trunk/plugins/VideoLAN/README.txt
===================================================================
--- trunk/plugins/VideoLAN/README.txt (rev 0)
+++ trunk/plugins/VideoLAN/README.txt 2007-03-25 20:46:35 UTC (rev 222)
@@ -0,0 +1,40 @@
+VideoLAN External Player Plugin (25-03-2007)
+
+This plugin can send video/audio to the VLC engine (natively). Its strengths are that it handles m4 extensions (needed for Apple video podcasts),
+it can handle UDP streams (supported by some STB's and certain IPTV services) and it can buffer the signal,
+so web streams can be viewed without lag. It also supports recording, timeshifting, seeking; in fact anything VLC
+supports.
+
+
+-----Installation-----
+
+1) Make sure you installed the latest version of VLC from www.videolan.org.
+ Copy 'libvlc.dll' from '\<VLC root directory>\VLC' to the MP root folder
+
+2) Go to /Release/Plugins/ExternalPlayers and copy the VideoLAN.dll to your /Plugins/ExternalPlayers folder
+
+ The VLC plugin is the same as was used by early versions of the Dreambox plugin.
+ The adjustments made should not cause any trouble for users using that plugin.
+
+3) Enable the VideoLan plugin in the MP configuration, configure it if necessary,
+ and configure the IPTV plugin.
+
+
+-----Version history-----
+
+0.8
+- Extracted VideoLAN from the ExternalPlayers library; it is now a standalone plugin available in the MP Plugin SVN
+
+0.7
+- Switched from ActiveX to a native C# library
+- More action support, like big/medium/short step forward/backword, ability to make screenshots, DVD menu handling, audio/subtitle track rotation...
+- Recording support (A Record-action in MP starts/stops the recording). It stores the recordings in /<MP root folder/vlciptv/.
+- Removed the logo when not playing streams (which was actually caused by the activeX control)
+
+0.6:
+- Fixed configuration not being written to file, because the Config class doesn't like text such as
+ udp://,http://. Now you only need to specify the protocol, e.g. udp,http,...
+- Some bugfixes
+
+0.1-0.5:
+- Initial release from Zipperzip (this is also in the MP SVN)
Added: trunk/plugins/VideoLAN/VideoLAN.csproj
===================================================================
--- trunk/plugins/VideoLAN/VideoLAN.csproj (rev 0)
+++ trunk/plugins/VideoLAN/VideoLAN.csproj 2007-03-25 20:46:35 UTC (rev 222)
@@ -0,0 +1,106 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{6AED9B8D-2C18-4217-9823-3C1A60E70B78}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>VideoLAN</RootNamespace>
+ <AssemblyName>VideoLAN</AssemblyName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="AxInterop.AXVLC, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\AxInterop.AXVLC.dll</HintPath>
+ </Reference>
+ <Reference Include="AXVLC, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\AXVLC.dll</HintPath>
+ </Reference>
+ <Reference Include="Core, Version=1.0.2586.6922, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\trunk\mediaportal\xbmc\bin\Release\Core.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml" />
+ <Reference Include="Utils, Version=1.0.2586.6921, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\trunk\mediaportal\xbmc\bin\Release\Utils.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="ConfigurationForm.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="InnerVlcWindow.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="InnerVlcWindow.designer.cs">
+ <DependentUpon>InnerVlcWindow.cs</DependentUpon>
+ </Compile>
+ <Compile Include="IPlayer.cs" />
+ <Compile Include="NativeLibVlc.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="VideoLanControl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="VideoLanControl.designer.cs">
+ <DependentUpon>VideoLanControl.cs</DependentUpon>
+ </Compile>
+ <Compile Include="VideoLanPlugin.cs" />
+ <Compile Include="VlcUserControl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="VlcUserControl.designer.cs">
+ <DependentUpon>VlcUserControl.cs</DependentUpon>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="ConfigurationForm.resx">
+ <DependentUpon>ConfigurationForm.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="InnerVlcWindow.resx">
+ <DependentUpon>InnerVlcWindow.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="VideoLanControl.resx">
+ <DependentUpon>VideoLanControl.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="VlcUserControl.resx">
+ <DependentUpon>VlcUserControl.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Added: trunk/plugins/VideoLAN/VideoLAN.sln
===================================================================
--- trunk/plugins/VideoLAN/VideoLAN.sln (rev 0)
+++ trunk/plugins/VideoLAN/VideoLAN.sln 2007-03-25 20:46:35 UTC (rev 222)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VideoLAN", "VideoLAN.csproj", "{6AED9B8D-2C18-4217-9823-3C1A60E70B78}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {6AED9B8D-2C18-4217-9823-3C1A60E70B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6AED9B8D-2C18-4217-9823-3C1A60E70B78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6AED9B8D-2C18-4217-9823-3C1A60E70B78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6AED9B8D-2C18-4217-9823-3C1A60E70B78}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: trunk/plugins/VideoLAN/VideoLAN.suo
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/VideoLAN/VideoLAN.suo
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/VideoLAN/VideoLanPlugin.cs
===================================================================
--- trunk/plugins/VideoLAN/VideoLanPlugin.cs 2007-03-24 17:01:55 UTC (rev 221)
+++ trunk/plugins/VideoLAN/VideoLanPlugin.cs 2007-03-25 20:46:35 UTC (rev 222)
@@ -53,17 +53,17 @@
public override string PlayerName
{
- get { return "VideoLan"; }
+ get { return "VideoLAN"; }
}
public override string AuthorName
{
- get { return "ZipperZip/Moiristo"; }
+ get { return "Moiristo"; }
}
public override string VersionNumber
{
- get { return "0.7"; }
+ get { return "0.8"; }
}
public override string[] GetAllSupportedExtensions()
Added: trunk/plugins/VideoLAN/bin/AXVLC.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/VideoLAN/bin/AXVLC.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/VideoLAN/bin/AxInterop.AXVLC.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/VideoLAN/bin/AxInterop.AXVLC.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <soa...@us...> - 2007-04-17 09:31:23
|
Revision: 337
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=337&view=rev
Author: soapskyway
Date: 2007-04-17 02:31:10 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
Added configuration for deinterlace support in VLC
Modified Paths:
--------------
trunk/plugins/VideoLAN/ConfigurationForm.cs
trunk/plugins/VideoLAN/VideoLanPlugin.cs
Modified: trunk/plugins/VideoLAN/ConfigurationForm.cs
===================================================================
--- trunk/plugins/VideoLAN/ConfigurationForm.cs 2007-04-16 22:15:24 UTC (rev 336)
+++ trunk/plugins/VideoLAN/ConfigurationForm.cs 2007-04-17 09:31:10 UTC (rev 337)
@@ -45,6 +45,7 @@
private string m_enabledExt = "";
private string m_enabledStreams = "";
private string bufsize = "";
+ private string m_deinterlace = "Disable";
private MediaPortal.UserInterface.Controls.MPButton buttonEnable;
private MediaPortal.UserInterface.Controls.MPTextBox extensionBox;
private TextBox streamBox;
@@ -53,6 +54,8 @@
private Label label2;
private TextBox bufBox;
private Label label3;
+ private Label label4;
+ private ComboBox deintBox;
/// <summary>
/// Required designer variable.
/// </summary>
@@ -93,6 +96,8 @@
this.streamBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.deintBox = new System.Windows.Forms.ComboBox();
+ this.label4 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.bufBox = new System.Windows.Forms.TextBox();
@@ -101,7 +106,7 @@
//
// buttonEnable
//
- this.buttonEnable.Location = new System.Drawing.Point(11, 132);
+ this.buttonEnable.Location = new System.Drawing.Point(12, 163);
this.buttonEnable.Name = "buttonEnable";
this.buttonEnable.Size = new System.Drawing.Size(75, 23);
this.buttonEnable.TabIndex = 3;
@@ -135,6 +140,8 @@
//
// groupBox1
//
+ this.groupBox1.Controls.Add(this.deintBox);
+ this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.bufBox);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.label2);
@@ -143,20 +150,44 @@
this.groupBox1.Controls.Add(this.extensionBox);
this.groupBox1.Location = new System.Drawing.Point(11, 12);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(411, 114);
+ this.groupBox1.Size = new System.Drawing.Size(411, 145);
this.groupBox1.TabIndex = 7;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "General";
//
- // label2
+ // deintBox
//
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(6, 55);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(108, 13);
- this.label2.TabIndex = 7;
- this.label2.Text = "Associated protocols:";
+ this.deintBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.deintBox.FormattingEnabled = true;
+ this.deintBox.Items.AddRange(new object[] {
+ "Disable",
+ "Blend",
+ "Bob",
+ "Discard",
+ "Linear",
+ "Mean",
+ "X"});
+ this.deintBox.Location = new System.Drawing.Point(135, 107);
+ this.deintBox.Name = "deintBox";
+ this.deintBox.Size = new System.Drawing.Size(256, 21);
+ this.deintBox.TabIndex = 11;
//
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(6, 107);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(64, 13);
+ this.label4.TabIndex = 10;
+ this.label4.Text = "Deinterlace:";
+ //
+ // bufBox
+ //
+ this.bufBox.Location = new System.Drawing.Point(135, 80);
+ this.bufBox.Name = "bufBox";
+ this.bufBox.Size = new System.Drawing.Size(59, 20);
+ this.bufBox.TabIndex = 9;
+ //
// label3
//
this.label3.AutoSize = true;
@@ -166,17 +197,19 @@
this.label3.TabIndex = 8;
this.label3.Text = "Buffer size:";
//
- // bufBox
+ // label2
//
- this.bufBox.Location = new System.Drawing.Point(135, 80);
- this.bufBox.Name = "bufBox";
- this.bufBox.Size = new System.Drawing.Size(59, 20);
- this.bufBox.TabIndex = 9;
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(6, 55);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(108, 13);
+ this.label2.TabIndex = 7;
+ this.label2.Text = "Associated protocols:";
//
// ConfigurationForm
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
- this.ClientSize = new System.Drawing.Size(440, 167);
+ this.ClientSize = new System.Drawing.Size(440, 198);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.buttonEnable);
this.Name = "ConfigurationForm";
@@ -193,11 +226,12 @@
private void ConfigurationForm_Load(object sender, System.EventArgs e)
{
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Directory.GetCurrentDirectory() + @"\MediaPortal.xml"))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Directory.GetCurrentDirectory() + @"\MediaPortal.xml"))
{
m_enabledExt = xmlreader.GetValueAsString("vlcplugin", "enabledextensions", ".ts,.gary");
m_enabledStreams = xmlreader.GetValueAsString("vlcplugin", "enabledstreams", "udp");
bufsize = xmlreader.GetValueAsString("vlcplugin", "buffer", "5000");
+ m_deinterlace = xmlreader.GetValueAsString("vlcplugin", "deinterlace", "Disable");
m_enabledExt.Replace(":", ","); // in case it was using the old plugin code where the separator was ":"
}
if (m_enabledExt != null && m_enabledExt.Length > 0)
@@ -206,28 +240,29 @@
this.extensionBox.Text = m_enabledExt;
this.streamBox.Text = m_enabledStreams;
this.bufBox.Text = bufsize;
-
+ this.deintBox.SelectedItem = m_deinterlace;
}
private void ConfigurationForm_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
- using (MediaPortal.Profile.Settings xmlWriter = new MediaPortal.Profile.Settings(Directory.GetCurrentDirectory() + @"\MediaPortal.xml"))
- {
- xmlWriter.SetValue("vlcplugin", "enabledextensions", extensionBox.Text);
- xmlWriter.SetValue("vlcplugin", "enabledstreams", streamBox.Text);
- xmlWriter.SetValue("vlcplugin", "buffer", bufBox.Text);
- }
+ writeConfiguration();
}
private void buttonEnable_Click(object sender, System.EventArgs e)
{
+ writeConfiguration();
+ this.Close();
+ }
+
+ private void writeConfiguration()
+ {
using (MediaPortal.Profile.Settings xmlWriter = new MediaPortal.Profile.Settings(Directory.GetCurrentDirectory() + @"\MediaPortal.xml"))
- {
- xmlWriter.SetValue("vlcplugin", "enabledextensions", extensionBox.Text);
- xmlWriter.SetValue("vlcplugin", "enabledstreams", streamBox.Text);
- xmlWriter.SetValue("vlcplugin", "buffer", bufBox.Text);
- }
- this.Close();
+ {
+ xmlWriter.SetValue("vlcplugin", "enabledextensions", extensionBox.Text);
+ xmlWriter.SetValue("vlcplugin", "enabledstreams", streamBox.Text);
+ xmlWriter.SetValue("vlcplugin", "buffer", bufBox.Text);
+ xmlWriter.SetValue("vlcplugin", "deinterlace", deintBox.Text);
+ }
}
}
}
Modified: trunk/plugins/VideoLAN/VideoLanPlugin.cs
===================================================================
--- trunk/plugins/VideoLAN/VideoLanPlugin.cs 2007-04-16 22:15:24 UTC (rev 336)
+++ trunk/plugins/VideoLAN/VideoLanPlugin.cs 2007-04-17 09:31:10 UTC (rev 337)
@@ -145,19 +145,35 @@
string vlciptvdir = Directory.GetCurrentDirectory() + @"\vlciptv";
if (!Directory.Exists(vlciptvdir)) Directory.CreateDirectory(vlciptvdir);
- string[] option = new string[]{
- ":http-caching=" + getBufferSize(),
- ":mms-caching=" + getBufferSize(),
- ":realrtsp-caching=" + getBufferSize(),
- //":tcp-caching==" + getBufferSize(),
- //":udp-caching==" + getBufferSize(),
- ":smb-caching=" + getBufferSize(),
- ":snapshot-path=" + vlciptvdir,
- ":record-path=" + vlciptvdir,
- ":timeshift-dir=" + vlciptvdir,
- ":access-filter=record"
- };
+ string deinterlace = getDeinterlace();
+ string[] option;
+
+ if (!deinterlace.Equals("disable"))
+ {
+ option= new string[]{
+ ":http-caching=" + getBufferSize(),
+ ":mms-caching=" + getBufferSize(),
+ ":realrtsp-caching=" + getBufferSize(),
+ ":smb-caching=" + getBufferSize(),
+ ":snapshot-path=" + vlciptvdir,
+ ":record-path=" + vlciptvdir,
+ ":timeshift-dir=" + vlciptvdir,
+ ":access-filter=record",
+ ":vout-filter=deinterlace", ":deinterlace-mode=" + deinterlace
+ };
+ } else {
+ option = new string[]{
+ ":http-caching=" + getBufferSize(),
+ ":mms-caching=" + getBufferSize(),
+ ":realrtsp-caching=" + getBufferSize(),
+ ":smb-caching=" + getBufferSize(),
+ ":snapshot-path=" + vlciptvdir,
+ ":record-path=" + vlciptvdir,
+ ":timeshift-dir=" + vlciptvdir,
+ ":access-filter=record",
+ };
+ }
vlcControl.Stop();
vlcControl.ClearPlayList();
@@ -668,6 +684,14 @@
return result;
}
+ private string getDeinterlace()
+ {
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Directory.GetCurrentDirectory() + @"\MediaPortal.xml"))
+ {
+ string deinterlace = xmlreader.GetValueAsString("vlcplugin", "deinterlace", "Disable");
+ return deinterlace.ToLowerInvariant();
+ }
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <moi...@us...> - 2008-02-16 17:21:45
|
Revision: 1373
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1373&view=rev
Author: moiristo
Date: 2008-02-16 09:21:42 -0800 (Sat, 16 Feb 2008)
Log Message:
-----------
Version 0.9; altered HasVideo function, rewritten readme, created MPI project and icons
Modified Paths:
--------------
trunk/plugins/VideoLAN/ConfigurationForm.cs
trunk/plugins/VideoLAN/ConfigurationForm.resx
trunk/plugins/VideoLAN/VideoLAN.csproj
trunk/plugins/VideoLAN/VideoLAN.sln
trunk/plugins/VideoLAN/VideoLanPlugin.cs
trunk/plugins/VideoLAN/VlcUserControl.cs
Added Paths:
-----------
trunk/plugins/VideoLAN/VideoLAN_README.txt
trunk/plugins/VideoLAN/VideoLanLogo.png
trunk/plugins/VideoLAN/VideoLanLogoDisabled.png
trunk/plugins/VideoLAN/videolan.xmp
Removed Paths:
-------------
trunk/plugins/VideoLAN/README.txt
Modified: trunk/plugins/VideoLAN/ConfigurationForm.cs
===================================================================
--- trunk/plugins/VideoLAN/ConfigurationForm.cs 2008-02-16 15:46:56 UTC (rev 1372)
+++ trunk/plugins/VideoLAN/ConfigurationForm.cs 2008-02-16 17:21:42 UTC (rev 1373)
@@ -119,6 +119,7 @@
/// </summary>
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigurationForm));
this.okBtn = new MediaPortal.UserInterface.Controls.MPButton();
this.transBox = new System.Windows.Forms.GroupBox();
this.avBox = new System.Windows.Forms.ComboBox();
@@ -129,23 +130,23 @@
this.label3 = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.audPanel = new System.Windows.Forms.Panel();
- this.checkBox19 = new System.Windows.Forms.CheckBox();
this.checkBox20 = new System.Windows.Forms.CheckBox();
this.checkBox21 = new System.Windows.Forms.CheckBox();
this.checkBox22 = new System.Windows.Forms.CheckBox();
this.checkBox23 = new System.Windows.Forms.CheckBox();
+ this.checkBox7 = new System.Windows.Forms.CheckBox();
this.checkBox14 = new System.Windows.Forms.CheckBox();
this.checkBox16 = new System.Windows.Forms.CheckBox();
this.checkBox17 = new System.Windows.Forms.CheckBox();
this.checkBox9 = new System.Windows.Forms.CheckBox();
this.checkBox4 = new System.Windows.Forms.CheckBox();
this.vidPanel = new System.Windows.Forms.Panel();
+ this.checkBox19 = new System.Windows.Forms.CheckBox();
this.checkBox27 = new System.Windows.Forms.CheckBox();
this.checkBox15 = new System.Windows.Forms.CheckBox();
this.checkBox10 = new System.Windows.Forms.CheckBox();
this.checkBox11 = new System.Windows.Forms.CheckBox();
this.checkBox13 = new System.Windows.Forms.CheckBox();
- this.checkBox7 = new System.Windows.Forms.CheckBox();
this.checkBox8 = new System.Windows.Forms.CheckBox();
this.checkBox6 = new System.Windows.Forms.CheckBox();
this.checkBox5 = new System.Windows.Forms.CheckBox();
@@ -275,11 +276,11 @@
//
// audPanel
//
- this.audPanel.Controls.Add(this.checkBox19);
this.audPanel.Controls.Add(this.checkBox20);
this.audPanel.Controls.Add(this.checkBox21);
this.audPanel.Controls.Add(this.checkBox22);
this.audPanel.Controls.Add(this.checkBox23);
+ this.audPanel.Controls.Add(this.checkBox7);
this.audPanel.Controls.Add(this.checkBox14);
this.audPanel.Controls.Add(this.checkBox16);
this.audPanel.Controls.Add(this.checkBox17);
@@ -287,19 +288,9 @@
this.audPanel.Controls.Add(this.checkBox4);
this.audPanel.Location = new System.Drawing.Point(86, 19);
this.audPanel.Name = "audPanel";
- this.audPanel.Size = new System.Drawing.Size(74, 277);
+ this.audPanel.Size = new System.Drawing.Size(74, 295);
this.audPanel.TabIndex = 26;
//
- // checkBox19
- //
- this.checkBox19.AutoSize = true;
- this.checkBox19.Location = new System.Drawing.Point(10, 100);
- this.checkBox19.Name = "checkBox19";
- this.checkBox19.Size = new System.Drawing.Size(40, 17);
- this.checkBox19.TabIndex = 21;
- this.checkBox19.Text = ".flv";
- this.checkBox19.UseVisualStyleBackColor = true;
- //
// checkBox20
//
this.checkBox20.AutoSize = true;
@@ -340,10 +331,20 @@
this.checkBox23.Text = ".dts";
this.checkBox23.UseVisualStyleBackColor = true;
//
+ // checkBox7
+ //
+ this.checkBox7.AutoSize = true;
+ this.checkBox7.Location = new System.Drawing.Point(10, 215);
+ this.checkBox7.Name = "checkBox7";
+ this.checkBox7.Size = new System.Drawing.Size(51, 17);
+ this.checkBox7.TabIndex = 8;
+ this.checkBox7.Text = ".wma";
+ this.checkBox7.UseVisualStyleBackColor = true;
+ //
// checkBox14
//
this.checkBox14.AutoSize = true;
- this.checkBox14.Location = new System.Drawing.Point(10, 215);
+ this.checkBox14.Location = new System.Drawing.Point(10, 192);
this.checkBox14.Name = "checkBox14";
this.checkBox14.Size = new System.Drawing.Size(49, 17);
this.checkBox14.TabIndex = 16;
@@ -353,7 +354,7 @@
// checkBox16
//
this.checkBox16.AutoSize = true;
- this.checkBox16.Location = new System.Drawing.Point(10, 192);
+ this.checkBox16.Location = new System.Drawing.Point(10, 169);
this.checkBox16.Name = "checkBox16";
this.checkBox16.Size = new System.Drawing.Size(49, 17);
this.checkBox16.TabIndex = 14;
@@ -363,7 +364,7 @@
// checkBox17
//
this.checkBox17.AutoSize = true;
- this.checkBox17.Location = new System.Drawing.Point(10, 169);
+ this.checkBox17.Location = new System.Drawing.Point(10, 146);
this.checkBox17.Name = "checkBox17";
this.checkBox17.Size = new System.Drawing.Size(47, 17);
this.checkBox17.TabIndex = 13;
@@ -373,7 +374,7 @@
// checkBox9
//
this.checkBox9.AutoSize = true;
- this.checkBox9.Location = new System.Drawing.Point(10, 146);
+ this.checkBox9.Location = new System.Drawing.Point(10, 123);
this.checkBox9.Name = "checkBox9";
this.checkBox9.Size = new System.Drawing.Size(49, 17);
this.checkBox9.TabIndex = 6;
@@ -383,7 +384,7 @@
// checkBox4
//
this.checkBox4.AutoSize = true;
- this.checkBox4.Location = new System.Drawing.Point(10, 123);
+ this.checkBox4.Location = new System.Drawing.Point(10, 100);
this.checkBox4.Name = "checkBox4";
this.checkBox4.Size = new System.Drawing.Size(49, 17);
this.checkBox4.TabIndex = 3;
@@ -392,12 +393,12 @@
//
// vidPanel
//
+ this.vidPanel.Controls.Add(this.checkBox19);
this.vidPanel.Controls.Add(this.checkBox27);
this.vidPanel.Controls.Add(this.checkBox15);
this.vidPanel.Controls.Add(this.checkBox10);
this.vidPanel.Controls.Add(this.checkBox11);
this.vidPanel.Controls.Add(this.checkBox13);
- this.vidPanel.Controls.Add(this.checkBox7);
this.vidPanel.Controls.Add(this.checkBox8);
this.vidPanel.Controls.Add(this.checkBox6);
this.vidPanel.Controls.Add(this.checkBox5);
@@ -409,10 +410,20 @@
this.vidPanel.Size = new System.Drawing.Size(74, 295);
this.vidPanel.TabIndex = 25;
//
+ // checkBox19
+ //
+ this.checkBox19.AutoSize = true;
+ this.checkBox19.Location = new System.Drawing.Point(8, 77);
+ this.checkBox19.Name = "checkBox19";
+ this.checkBox19.Size = new System.Drawing.Size(40, 17);
+ this.checkBox19.TabIndex = 21;
+ this.checkBox19.Text = ".flv";
+ this.checkBox19.UseVisualStyleBackColor = true;
+ //
// checkBox27
//
this.checkBox27.AutoSize = true;
- this.checkBox27.Location = new System.Drawing.Point(8, 102);
+ this.checkBox27.Location = new System.Drawing.Point(8, 123);
this.checkBox27.Name = "checkBox27";
this.checkBox27.Size = new System.Drawing.Size(53, 17);
this.checkBox27.TabIndex = 24;
@@ -422,7 +433,7 @@
// checkBox15
//
this.checkBox15.AutoSize = true;
- this.checkBox15.Location = new System.Drawing.Point(8, 125);
+ this.checkBox15.Location = new System.Drawing.Point(8, 146);
this.checkBox15.Name = "checkBox15";
this.checkBox15.Size = new System.Drawing.Size(49, 17);
this.checkBox15.TabIndex = 15;
@@ -442,7 +453,7 @@
// checkBox11
//
this.checkBox11.AutoSize = true;
- this.checkBox11.Location = new System.Drawing.Point(8, 171);
+ this.checkBox11.Location = new System.Drawing.Point(8, 192);
this.checkBox11.Name = "checkBox11";
this.checkBox11.Size = new System.Drawing.Size(49, 17);
this.checkBox11.TabIndex = 11;
@@ -452,23 +463,13 @@
// checkBox13
//
this.checkBox13.AutoSize = true;
- this.checkBox13.Location = new System.Drawing.Point(6, 263);
+ this.checkBox13.Location = new System.Drawing.Point(8, 261);
this.checkBox13.Name = "checkBox13";
this.checkBox13.Size = new System.Drawing.Size(51, 17);
this.checkBox13.TabIndex = 9;
this.checkBox13.Text = ".wmv";
this.checkBox13.UseVisualStyleBackColor = true;
//
- // checkBox7
- //
- this.checkBox7.AutoSize = true;
- this.checkBox7.Location = new System.Drawing.Point(8, 240);
- this.checkBox7.Name = "checkBox7";
- this.checkBox7.Size = new System.Drawing.Size(51, 17);
- this.checkBox7.TabIndex = 8;
- this.checkBox7.Text = ".wma";
- this.checkBox7.UseVisualStyleBackColor = true;
- //
// checkBox8
//
this.checkBox8.AutoSize = true;
@@ -482,7 +483,7 @@
// checkBox6
//
this.checkBox6.AutoSize = true;
- this.checkBox6.Location = new System.Drawing.Point(8, 194);
+ this.checkBox6.Location = new System.Drawing.Point(8, 215);
this.checkBox6.Name = "checkBox6";
this.checkBox6.Size = new System.Drawing.Size(49, 17);
this.checkBox6.TabIndex = 5;
@@ -492,7 +493,7 @@
// checkBox5
//
this.checkBox5.AutoSize = true;
- this.checkBox5.Location = new System.Drawing.Point(8, 148);
+ this.checkBox5.Location = new System.Drawing.Point(8, 169);
this.checkBox5.Name = "checkBox5";
this.checkBox5.Size = new System.Drawing.Size(49, 17);
this.checkBox5.TabIndex = 4;
@@ -512,7 +513,7 @@
// checkBox2
//
this.checkBox2.AutoSize = true;
- this.checkBox2.Location = new System.Drawing.Point(8, 79);
+ this.checkBox2.Location = new System.Drawing.Point(8, 100);
this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(49, 17);
this.checkBox2.TabIndex = 1;
@@ -522,7 +523,7 @@
// checkBox1
//
this.checkBox1.AutoSize = true;
- this.checkBox1.Location = new System.Drawing.Point(8, 217);
+ this.checkBox1.Location = new System.Drawing.Point(8, 238);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(37, 17);
this.checkBox1.TabIndex = 0;
@@ -557,7 +558,7 @@
this.protBox.Controls.Add(this.mmsOpt);
this.protBox.Location = new System.Drawing.Point(12, 111);
this.protBox.Name = "protBox";
- this.protBox.Size = new System.Drawing.Size(240, 73);
+ this.protBox.Size = new System.Drawing.Size(240, 63);
this.protBox.TabIndex = 24;
this.protBox.TabStop = false;
this.protBox.Text = "Associated input protocols";
@@ -565,7 +566,7 @@
// httpOpt
//
this.httpOpt.AutoSize = true;
- this.httpOpt.Location = new System.Drawing.Point(8, 26);
+ this.httpOpt.Location = new System.Drawing.Point(6, 19);
this.httpOpt.Name = "httpOpt";
this.httpOpt.Size = new System.Drawing.Size(44, 17);
this.httpOpt.TabIndex = 12;
@@ -575,7 +576,7 @@
// udpOpt
//
this.udpOpt.AutoSize = true;
- this.udpOpt.Location = new System.Drawing.Point(8, 49);
+ this.udpOpt.Location = new System.Drawing.Point(6, 42);
this.udpOpt.Name = "udpOpt";
this.udpOpt.Size = new System.Drawing.Size(44, 17);
this.udpOpt.TabIndex = 7;
@@ -585,7 +586,7 @@
// rtspOpt
//
this.rtspOpt.AutoSize = true;
- this.rtspOpt.Location = new System.Drawing.Point(71, 26);
+ this.rtspOpt.Location = new System.Drawing.Point(69, 19);
this.rtspOpt.Name = "rtspOpt";
this.rtspOpt.Size = new System.Drawing.Size(43, 17);
this.rtspOpt.TabIndex = 2;
@@ -595,7 +596,7 @@
// mmsOpt
//
this.mmsOpt.AutoSize = true;
- this.mmsOpt.Location = new System.Drawing.Point(71, 49);
+ this.mmsOpt.Location = new System.Drawing.Point(69, 42);
this.mmsOpt.Name = "mmsOpt";
this.mmsOpt.Size = new System.Drawing.Size(47, 17);
this.mmsOpt.TabIndex = 1;
@@ -632,11 +633,12 @@
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.transBox);
this.Controls.Add(this.okBtn);
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "ConfigurationForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "VideoLan Player Configuration";
+ this.Load += new System.EventHandler(this.ConfigurationForm_Load);
this.Closing += new System.ComponentModel.CancelEventHandler(this.ConfigurationForm_Closing);
- this.Load += new System.EventHandler(this.ConfigurationForm_Load);
this.transBox.ResumeLayout(false);
this.transBox.PerformLayout();
this.groupBox2.ResumeLayout(false);
@@ -723,7 +725,7 @@
private void writeConfiguration()
{
- using (MediaPortal.Profile.Settings xmlWriter = new MediaPortal.Profile.Settings(Directory.GetCurrentDirectory() + @"\MediaPortal.xml"))
+ using (MediaPortal.Profile.Settings xmlWriter = new MediaPortal.Profile.Settings(MediaPortal.Configuration.Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + @"\MediaPortal.xml"))
{
xmlWriter.SetValue("vlcplugin", "visual", avBox.Text);
xmlWriter.SetValue("vlcplugin", "enabledextensions", getCheckedExtensions());
Modified: trunk/plugins/VideoLAN/ConfigurationForm.resx
===================================================================
--- trunk/plugins/VideoLAN/ConfigurationForm.resx 2008-02-16 15:46:56 UTC (rev 1372)
+++ trunk/plugins/VideoLAN/ConfigurationForm.resx 2008-02-16 17:21:42 UTC (rev 1373)
@@ -117,4 +117,1449 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAYAICAAAAEACACoCAAAZgAAABAQAAABAAgAaAUAAA4JAACAgAAAAQAgACgIAQB2DgAAMDAAAAEA
+ IACoJQAAnhYBACAgAAABACAAqBAAAEY8AQAQEAAAAQAgAGgEAADuTAEAKAAAACAAAABAAAAAAQAIAAAA
+ AAAAAAAAAAAAAAAAAAAAAQAAAAAAAAIymgCinpoAAmLCAErC/gAGZtIAAnrqAMbCugDa2tIAAmLmAAJS
+ xgACkvoAJnreAAJu5gC+ytoA5ubeAAKG9gBSkt4AAlraAAJGtgDOzsoAAm7yAAJu3gDa2t4AAlrGALay
+ rgACevYAAmLeAEq+/gAGPqoAAmrmAEqS5gBqptoAzsq+ANra2gACUtIAAnbqANLSzgCessoAisLqAAKC
+ 8gAmhuYA6urmAAKO9gBSnuIA3tbKAAJ28gC+urYAAmreANbWzgAOOpoAZnqaAAJ68gACZu4AAm7uAAJO
+ wgDS0soA4uLeAAJa0gACgvYAkqrKAErK/gAWatIAusLGAOLe0gACZuYAAlLOAAKm+gDm5uIAAob+AAJy
+ 8gACZt4ARp7qADqO4gBSouoAwr62ANbW0gCyqqIAAmLaAA566gACcuoAAor2AAJe5gACSr4AAn72AAJC
+ tgACau4ARpbmAMrKxgDe3toAAlbSAAI6pgA+esYA2tLKAObi4gACXtYAvr66AAI2ngA6cr4ASsb+AAJ6
+ 7gDKxr4A2trWAAJi6gACVsYAApr6ADqC3gACbuoA6ubeAFKa5gACRroA0s7KAAJu9gAOcuIA4t7eAAJa
+ zgC2trYAAmLiAAI+rgACauoAkrLOAAJ27gDW0s4AmtLyACqK4gDu6uYAAo76AG6i2gACdvYAAmriAHaO
+ rgCurqoAxsbCAAJSvgBGjt4AAn7yAAJy7gBKzv4AAlbOAF6i6gACZtoAAj6mAN7WzgACWtYAAoL6AAJm
+ 6gAKpvoAAnL2AAJm4gACivoAAl7qAAJ++gACVtYA1tLKAObi3gDm3tIA6ubiANrW0gBKluYAzsrGAOLe
+ 2gDCvroAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGh
+ oaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGh
+ oaGhoaEXFxcXFxcXFxcXFxcXFxcXFxcXFxcXFxcXF6GhoaGhoWJiAwNiYmIDGxsbGxsbGxsbAwM8PDw8
+ PDw8oaGhoaGhQkIKKioPGTUICFEICJB2NYcthjqUCgpoQpGhoaGhoaGhCg8nJ5NBWU2TdAiQdjU1akAR
+ IoAPUAoKoaGhoaGhoaGhhmNNVAleRoBRUTQ0NUWHHY5SdV4MhqGhoaGhoaGhoaGheAlaCVkacAtphYVI
+ KE4dIlJgEpehoaGhoaGhoaGhoaGhOVo2WyUWEzhcmZhYPg1hEgBUoaGhoaGhoaGhoaGhoaGhHIEGn244
+ bkMkOJ5YBpwyMaGhoaGhoaGhoaGhoaGhoaGhTGWDOG44JENuOINlGJ6hoaGhoaGhoaGhoaGhoaGhoaFX
+ LlgTQzdDJEMTWF8kAaGhoaGhoaGhoaGhoaGhoaGhoYJLZA4sa42bLA4gZYKgoaGhoaGhoaGhoaGhoaGh
+ oaGhoYIhd34QHlYrHztzbqGhoaGhoaGhoaGhoaGhoaGhoaGhPT2ANTQULRkZHT09oaGhoaGhoaGhoaGh
+ oaGhoaGhoaFychUjNUUzJyeAcnKhoaGhoaGhoaGhoaGhoaGhoaGhoaEXLyM1RRk6hkYXoaGhoaGhoaGh
+ oaGhoaGhoaGhoaGhoYQvBTVFGTqGTYShoaGhoaGhoaGhoaGhoaGhoaGhoaGhhIsjFBQZOjOOhKGhoaGh
+ oaGhoaGhoaGhoaGhoaGhoaGhBHtWbElHKImhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaFYMCk/fI1xMKGh
+ oaGhoaGhoaGhoaGhoaGhoaGhoaGhoVhDBykHQ1hDoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhZW4pnCl5
+ KW6hoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhWAcpB0NKoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaEG
+ fD98LG6hoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoU+KioqKT6GhoaGhoaGhoaGhoaGhoaGhoaGhoaGh
+ oaGhoU9FljWhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhFRk6L6GhoaGhoaGhoaGhoaGhoaGhoaGh
+ oaGhoaGhoaECGUQCoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaECAqGhoaGhoaGhoaGhoaGhoaGh
+ oaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGh////////////////4AAAB+AAAAfgAAAH8AAAD/gA
+ AB/8AAA//gAAf/8AAP//gAH//4AB//+AAf//wAP//8AD///AA///4Af//+AH///gB///8A////AP///w
+ D///8A////gf///4H///+B////w////8P////D////5///////8oAAAAEAAAACAAAAABAAgAAAAAAAAA
+ AAAAAAAAAAAAAAABAAAAAAAADkamAGKSygBejsIAGrr+AMa6rgACauYAzs7GACJ+4gACWtYAcpbCAAJ2
+ 7gCyvsoA4trOAAJe4gACcuYAGq7+AAKO+gC+sqYAAj66AN7WzgACkvoAysbCAAJq7gDW0sYAAn72AAJi
+ 1gDGys4AAmbmAJq2ygACbuYAAnryAKrC2gDi3tYAAnLuAAJGugAanv4AAn76AA5OsgAavv4AzsKyAAJq
+ 6gDWzsYAAlraAHaiygAOdu4AtsLOAObe0gACYuIAGrb+ACqO6gDCtqYA0sq+ANrSygAOgvIAAmbeAAJm
+ 6gCetsoAAnLyAAJKwgAaov4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAADw8Ojo6Ojo6Ojo6Ojo6PDw8JjAwDyMjIyM7Ow8DJiY8PBAQEAoF
+ GzcWIQoeEBAQPDw8NjY6Ki8bISENIhk2PDw8PDwIJQE4Cy0cAgASPDw8PDw8PCUnKRcXMzIlPDw8PDw8
+ PDw8JwYaGhUnPDw8PDw8PDw8PAcHLDUHBzw8PDw8PDw8PDwhHTkYCiE8PDw8PDw8PDw8PAU5GAU8PDw8
+ PDw8PDw8PDwrHx8JPDw8PDw8PDw8PDw8BC4METw8PDw8PDw8PDw8PDEgEzE8PDw8PDw8PDw8PDw8MTE8
+ PDw8PDw8PDw8PDw8PA4OPDw8PDw8PDw8PDw8PDw8PDw8PDw8PDzAA/ZJgAHAA4ABgAHAA4AB4AfAA/AP
+ 4Af4H/AP+B/4H/gf+B/8P/gf/D/8P/w//D/8P/w//n/8P/5//n////5/KAAAAIAAAAAAAQAAAQAgAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAZRIA6BjaW2AA8qf8ARbP/AEO1/wBEuP8ASr3/AE3A/wBOwv8AUcX/AFHG/wBSxv8AUcb/AFLH/wBS
+ x/8ATsT/AEzE/wBNxP8ATcT/AEzE/wBNxP8ATcX/AE3E/wBNxP8ATsX/AE3F/wBNxf8ATsb/AE7G/wBP
+ x/8ATsb/AE/G/wBPx/8AT8f/AE7G/wBPx/8AUMj/AFDI/wBQx/8AUMj/AFDI/wBQyP8AUcn/AFHI/wBR
+ yf8AUsr/AFLJ/wBSyf8AUsr/AFLK/wBSyv8AU8r/AFLK/wBSyv8AUsr/AFLL/wBSyv8AUsr/AFPK/wBT
+ yv8AUsr/AFLK/wBSyv8AUsr/AFLK/wBSyv8AUsr/AFLK/wBSyv8AUsr/AFLK/wBSyv8AUsr/AFLL/wBT
+ y/8AU8v/AFPM/wBTzP8AU8z/AFPM/wBTzP8AU8z/AFPM/wBTy/8AU8v/AFPM/wBTzP8AU8v/AFPL/wBT
+ y/8AUsv/AFLL/wBSy/8AUsr/AFLK/wBRyv8AUcn/AFDJ/wBRyf8AVs3/AFbN/wBVzf8AVc3/AFLK/wBL
+ w/8ASL7/AEm7/wBFtv4LOJK4KlSFGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQofLwAQbP/AEm9/wBLwf8ATsT/AFDI/wBR
+ yf8AUsv/AFLK/wBUzf8AVM3/AFbO/wBWz/8AV9D/AFfQ/wBX0P8AWND/AFjR/wBY0v8AWNH/AFnS/wBZ
+ 0v8AWdL/AFnS/wBZ0v8AWtP/AFnT/wBZ0/8AWtP/AFrU/wBa0/8AWtT/AFrU/wBa0/8AWtT/AFrU/wBb
+ 1P8AW9T/AFvU/wBb1P8AW9X/AFvV/wBc1f8AXNX/AFzV/wBd1v8AXdf/AF3W/wBd1/8AXtf/AF7X/wBe
+ 1/8AXdb/AF7X/wBe1/8AXdf/AF7X/wBe2P8AXtf/AF7Y/wBe2P8AXtf/AF7X/wBe1/8AXtf/AF7X/wBd
+ 1/8AXtf/AF7Y/wBe1/8AXdf/AF3W/wBe1/8AX9j/AF7X/wBd1/8AXtf/AF7X/wBe2P8AX9j/AF/Y/wBe
+ 2P8AXtj/AF7Y/wBf2P8AX9n/AF/Y/wBf2P8AX9j/AF7Y/wBf2P8AXtj/AF7X/wBe2P8AXtf/AF3X/wBd
+ 1v8AXdb/AFzW/wBd1/8AXdb/AF3W/wBc1v8AW9b/AFnU/wBW0P8AU8z/AFLO/wBAs/8LK3dtAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAABTOS1QBi2v8Aeuf/AIjt/wCO8P8Ak/L/AJb0/wCW9f8AlvX/AJf1/wCY9f8AmPb/AJj2/wCa
+ 9v8Amvf/AJr3/wCb9/8Am/f/AJz3/wCd9/8Anfj/AJ34/wCd+P8Anfj/AJ74/wCe+f8Anvj/AJ74/wCe
+ +P8Anvn/AJ74/wCe+P8Anvj/AJ/5/wCf+f8An/n/AJ/5/wCg+f8AoPn/AKD5/wCg+f8Aofn/AKH5/wCh
+ +f8Aofn/AKH5/wCi+f8Aovn/AKL5/wCj+v8Ao/r/AKL6/wCi+f8Aovr/AKP6/wCj+v8Ao/r/AKL5/wCi
+ +v8Ao/r/AKP6/wCj+v8Ao/r/AKP6/wCj+v8Ao/r/AKP6/wCj+v8Ao/r/AKL5/wCj+v8Ao/r/AKT6/wCk
+ +v8Ao/r/AKP5/wCk+v8ApPr/AKP6/wCk+v8Apfr/AKT6/wCk+f8ApPr/AKX6/wCk+v8Apfr/AKX6/wCl
+ +v8ApPr/AKX6/wCl+v8Ao/n/AKP6/wCj+f8Ao/n/AKP5/wCi+f8Aovn/AKL5/wCi+f8Ao/j/AKP4/wCi
+ +P8AoPf/AJv1/wCT8v8Ahu7/AGba/wMqg4oAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACZM7eAK7//wC7//9X0v//V9L//1fS
+ //9X0v//V9L//1fS//9X0v//V9L//1fR//9X0f//V9H//1fR//9X0f//V9L//1fS//9X0///V9T//1fU
+ //9X1P//V9X//1fU//9X1P//V9T//1fU//9X1f//V9X//1fV//9X1f//V9X//1fV//9X1f//V9X//1fV
+ //9X1f//V9f//1fX//9X1///V9b//1fW//9X1///V9f//1fX//9X1///V9b//1fX//9X1v//V9b//1fW
+ //9X1v//V9f//1fX//9X1///V9f//1fX//9X1///V9f//1fX//9X1///V9f//1fX//9X1///V9b//1fX
+ //9X1///V9f//1fX//9X1///V9f//1fX//9X1///V9b//1fX//9X1///V9f//1fX//9X1///V9f//1fX
+ //9X1///V9f//1fX//9X1///V9f//1fX//9X1///V9j//1fX//9X1///V9f//1fY//9X2P//V9f//1fX
+ //9X2P//V9f//1fY//9X2P//V9n//1fa//9X2///V9v//1fd//9X3v//V9///wDQ//8Atf//AEe3lgAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAWD4dQAsv//AK3//wCv//8AsP//AK///wCw//8Asf//ALH//wCx//8Asf//ALD//wCw
+ //8Asf//ALD//wCw//8AsP//ALH//wCz//8Atv//ALf//wC2//8Atv//ALX//wC0//8AtP//ALX//wC1
+ //8Atf//ALX//wC1//8Atf//ALT//wCz//8Asv//ALD//wCv//8Arv//AK7//wCs//8Ap///AKb//wCm
+ //8Ap///AKb//wCl//8Apv//AKb//wCm//8Apf//AKX//wCl//8Apv//AKX//wCm//8Apv//AKb//wCm
+ //8Apv//AKb//wCm//8Ap///AKf//wCm//8Apv//AKf//wCp//8Aqf//AKj//wCq//8ArP//AK3//wCv
+ //8AsP//ALH//wC0//8Atf//ALf//wC4//8AuP//ALn//wC5//8AuP//ALn//wC5//8Auf//ALj//wC4
+ //8Auf//ALn//wC5//8Auf//ALn//wC5//8Auf//ALn//wC5//8Auf//ALr//wC5//8Auv//ALn//wC7
+ //8AvP//ALz//wC///8Awf//AMX//wDK//8BaM2IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH5rusACr//8Asf//ALL//wCx
+ //8Asf//ALP//wCy//8Asf//ALH//wCw//8AsP//ALD//wCw//8Ar///ALD//wCx//8Asv//ALP//wC2
+ //8Atv//ALX//wCz//8AtP//ALP//wCz//8AtP//ALP//wCx//8Arv//AKv//wCl//8Aof//AJz+/wCZ
+ /v8AmP7/AJj+/wCX/v8Al///AJf//wCY/v8AmP//AJf//wCY//8AmP//AJj//wCY//8AmP//AJj+/wCY
+ /v8AmP//AJn//wCY/v8AmP7/AJn//wCZ//8Amf//AJr//wCZ//8Amv//AJr//wCa//8Amv//AJr//wCa
+ //8Amf7/AJr//wCa//8Amf7/AJr//wCa//8Amv//AJv//wCb//8AnP//AJz//wCg//8ApP//AKn//wCv
+ //8AtP//ALb//wC3//8At///ALj//wC3//8At///ALf//wC3//8AuP//ALn//wC5//8AuP//ALj//wC4
+ //8Auf//ALn//wC4//8Auf//ALn//wC6//8Auv//ALr//wC6//8AvP//AL///wDB//8Awv//AL///xaF
+ 2GEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAABIs/RmAKj9/wCz//8Asv//ALL//wCy//8As///ALL//wCx//8Asf//ALD//wCw
+ //8Arv//AK7//wCu//8AsP//ALD//wCw//8Asf//ALP//wCz//8Asv//ALL//wCx//8AsP//ALH//wCx
+ //8Arf//AKT//wCb/f8Alf3/AJP9/wCS/f8Ak/3/AJL9/wCT/f8Ak/3/AJT9/wCT/f8AlPz/AJT9/wCV
+ /f8AlP3/AJb9/wCU/f8AlP3/AJP8/wCT/f8AlP3/AJT9/wCV/f8AlP3/AJT9/wCV/f8AlP3/AJX9/wCV
+ /f8Alf3/AJb9/wCV/f8Alf3/AJX9/wCV/f8AlPz/AJX9/wCW/f8Al/3/AJb9/wCW/f8Alv3/AJb9/wCX
+ /f8Alv3/AJf9/wCX/f8Alv3/AJb9/wCW/f8Alv3/AJj9/wCg/v8ArP//ALL//wC0//8AtP//ALT//wC0
+ //8Atf//ALb//wC1//8Atv//ALb//wC2//8Atv//ALb//wC4//8At///ALf//wC3//8At///ALj//wC6
+ //8Auv//ALn//wC7//8AvP//AMD//wDB//8BtP38d8v3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIDJ9CoAo/r+ALL//wCy
+ //8Asf//ALH//wCx//8Asf//AK7//wCt//8ArP//AK3//wCs//8Aq///AKv//wCr//8ArP//AKv//wCt
+ //8Ar///AK///wCu//8Arf//AKz//wCt//8ArP//AKz//wCd/v8Aj/z/AI38/wCP/P8Ajvv/AI77/wCN
+ +/8Ajfv/AI78/wCP/P8Ajvv/AI/8/wCO+/8Aj/z/AI/7/wCQ/P8Aj/v/AI/7/wCP+/8Ajvv/AI77/wCO
+ +/8Aj/v/AI/7/wCP+/8Aj/v/AI37/wCN+/8Ajvv/AI77/wCO/P8Aj/z/AI/8/wCP/P8Aj/v/AI/7/wCP
+ +/8Aj/v/AI/7/wCP+/8Akfz/AJH8/wCQ+/8Akvz/AJL8/wCR+/8Akvz/AJH8/wCR/P8Akvz/AJP8/wCT
+ /P8Akvz/AJL8/wCU/P8ApP7/ALH//wCw//8AsP//ALH//wCx//8Asf//ALH//wCx//8Asv//ALL//wCz
+ //8AtP//ALT//wC0//8AtP//ALX//wC1//8Atv//ALb//wC3//8AuP//ALn//wC8//8Avv//ALz//x+4
+ +8y25fkCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAmtPzBhej9tQArf//ALD//wCv//8Ar///AK3//wCs//8Aqf7/AKn//wCp
+ //8Aqf//AKj+/wCo/v8Ap/7/AKf+/wCp//8AqP//AKn//wCq//8Aqf//AKr//wCo/v8AqP7/AKf+/wCp
+ //8AnP3/AIr6/wCK+v8Ai/r/AIr6/wCK+v8Aivr/AIr7/wCL+/8Aivr/AIr7/wCL+/8Ai/v/AIv6/wCL
+ +v8Ai/r/AIv6/wCL+/8Aivr/AIr7/wCK+/8Ai/v/AIv7/wCK+v8Aivr/AIv7/wCL+/8Aivv/AIr6/wCL
+ +/8Aivv/AIr6/wCK+/8Aivv/AIv7/wCL+/8Ai/v/AIz7/wCL+/8AjPv/AIz7/wCM+/8AjPr/AIz7/wCO
+ +/8AjPv/AIz6/wCN+/8Ajfv/AI37/wCO+/8Ajfr/AI77/wCO+v8Ajvr/AI77/wCO+/8ApP7/AK7//wCt
+ //8Arf//AK3//wCu//8Arf//AK3//wCu//8Ar///AK///wCv//8AsP//ALD//wCw//8Asf//ALL//wCy
+ //8As///ALP//wC2//8AuP//ALv//wC9//8AuP//UMT6kQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUrb0hgCk
+ /f8Arf//AK3//wCq//8Aqf7/AKj//wCn/v8Ap/7/AKb+/wCl/v8ApP7/AKT+/wCj/v8Ao/7/AKT+/wCj
+ /f8Apf7/AKf+/wCm/v8Apf7/AKX+/wCk/v8ApP3/AKL9/wCL+v8AiPr/AIn6/wCI+v8Aifr/AIj6/wCJ
+ +/8Aifr/AIr7/wCK+/8Ai/z/AIz8/wCN/P8Ajfz/AI78/wCN/P8Ajfz/AI38/wCM/P8Ajv3/AI/9/wCO
+ /f8Ajv3/AI/9/wCO/f8Ajv3/AI79/wCO/f8Ajv3/AI/9/wCP/v8Ajv3/AI79/wCP/f8Ajv3/AI/9/wCQ...
[truncated message content] |
|
From: <moi...@us...> - 2007-04-17 21:08:54
|
Revision: 340
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=340&view=rev
Author: moiristo
Date: 2007-04-17 14:08:51 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
- vlc opts are now created using arraylist
- improved the configuration form
Modified Paths:
--------------
trunk/plugins/VideoLAN/ConfigurationForm.cs
trunk/plugins/VideoLAN/VideoLAN.csproj
trunk/plugins/VideoLAN/VideoLAN.suo
trunk/plugins/VideoLAN/VideoLanPlugin.cs
Modified: trunk/plugins/VideoLAN/ConfigurationForm.cs
===================================================================
--- trunk/plugins/VideoLAN/ConfigurationForm.cs 2007-04-17 17:42:39 UTC (rev 339)
+++ trunk/plugins/VideoLAN/ConfigurationForm.cs 2007-04-17 21:08:51 UTC (rev 340)
@@ -41,21 +41,49 @@
/// </summary>
public class ConfigurationForm : System.Windows.Forms.Form
{
-
- private string m_enabledExt = "";
- private string m_enabledStreams = "";
private string bufsize = "";
private string m_deinterlace = "Disable";
- private MediaPortal.UserInterface.Controls.MPButton buttonEnable;
- private MediaPortal.UserInterface.Controls.MPTextBox extensionBox;
- private TextBox streamBox;
- private Label label1;
+ private MediaPortal.UserInterface.Controls.MPButton okBtn;
private GroupBox groupBox1;
- private Label label2;
private TextBox bufBox;
private Label label3;
private Label label4;
private ComboBox deintBox;
+ private GroupBox groupBox2;
+ private CheckBox checkBox6;
+ private CheckBox checkBox5;
+ private CheckBox checkBox4;
+ private CheckBox checkBox3;
+ private CheckBox checkBox2;
+ private CheckBox checkBox1;
+ private CheckBox checkBox19;
+ private CheckBox checkBox20;
+ private CheckBox checkBox21;
+ private CheckBox checkBox22;
+ private CheckBox checkBox23;
+ private CheckBox checkBox14;
+ private CheckBox checkBox15;
+ private CheckBox checkBox16;
+ private CheckBox checkBox17;
+ private CheckBox checkBox10;
+ private CheckBox checkBox11;
+ private CheckBox checkBox13;
+ private CheckBox checkBox7;
+ private CheckBox checkBox8;
+ private CheckBox checkBox9;
+ private Button allAudBtn;
+ private Button allVidBtn;
+ private GroupBox protBox;
+ private CheckBox httpOpt;
+ private CheckBox udpOpt;
+ private CheckBox rtspOpt;
+ private CheckBox mmsOpt;
+ private CheckBox checkBox27;
+ private Button cancelBtn;
+ private Button applyBtn;
+ private Panel audPanel;
+ private Panel vidPanel;
+ private bool isCancelled = false;
/// <summary>
/// Required designer variable.
/// </summary>
@@ -91,69 +119,75 @@
/// </summary>
private void InitializeComponent()
{
- this.buttonEnable = new MediaPortal.UserInterface.Controls.MPButton();
- this.extensionBox = new MediaPortal.UserInterface.Controls.MPTextBox();
- this.streamBox = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
+ this.okBtn = new MediaPortal.UserInterface.Controls.MPButton();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.deintBox = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
+ this.bufBox = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
- this.bufBox = new System.Windows.Forms.TextBox();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.audPanel = new System.Windows.Forms.Panel();
+ this.checkBox19 = new System.Windows.Forms.CheckBox();
+ this.checkBox20 = new System.Windows.Forms.CheckBox();
+ this.checkBox21 = new System.Windows.Forms.CheckBox();
+ this.checkBox22 = new System.Windows.Forms.CheckBox();
+ this.checkBox23 = new System.Windows.Forms.CheckBox();
+ this.checkBox14 = new System.Windows.Forms.CheckBox();
+ this.checkBox16 = new System.Windows.Forms.CheckBox();
+ this.checkBox17 = new System.Windows.Forms.CheckBox();
+ this.checkBox9 = new System.Windows.Forms.CheckBox();
+ this.checkBox4 = new System.Windows.Forms.CheckBox();
+ this.vidPanel = new System.Windows.Forms.Panel();
+ this.checkBox27 = new System.Windows.Forms.CheckBox();
+ this.checkBox15 = new System.Windows.Forms.CheckBox();
+ this.checkBox10 = new System.Windows.Forms.CheckBox();
+ this.checkBox11 = new System.Windows.Forms.CheckBox();
+ this.checkBox7 = new System.Windows.Forms.CheckBox();
+ this.checkBox8 = new System.Windows.Forms.CheckBox();
+ this.checkBox6 = new System.Windows.Forms.CheckBox();
+ this.checkBox5 = new System.Windows.Forms.CheckBox();
+ this.checkBox3 = new System.Windows.Forms.CheckBox();
+ this.checkBox2 = new System.Windows.Forms.CheckBox();
+ this.checkBox1 = new System.Windows.Forms.CheckBox();
+ this.allAudBtn = new System.Windows.Forms.Button();
+ this.allVidBtn = new System.Windows.Forms.Button();
+ this.checkBox13 = new System.Windows.Forms.CheckBox();
+ this.protBox = new System.Windows.Forms.GroupBox();
+ this.httpOpt = new System.Windows.Forms.CheckBox();
+ this.udpOpt = new System.Windows.Forms.CheckBox();
+ this.rtspOpt = new System.Windows.Forms.CheckBox();
+ this.mmsOpt = new System.Windows.Forms.CheckBox();
+ this.cancelBtn = new System.Windows.Forms.Button();
+ this.applyBtn = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.audPanel.SuspendLayout();
+ this.vidPanel.SuspendLayout();
+ this.protBox.SuspendLayout();
this.SuspendLayout();
//
- // buttonEnable
+ // okBtn
//
- this.buttonEnable.Location = new System.Drawing.Point(12, 163);
- this.buttonEnable.Name = "buttonEnable";
- this.buttonEnable.Size = new System.Drawing.Size(75, 23);
- this.buttonEnable.TabIndex = 3;
- this.buttonEnable.Text = "Save";
- this.buttonEnable.UseVisualStyleBackColor = true;
- this.buttonEnable.Click += new System.EventHandler(this.buttonEnable_Click);
+ this.okBtn.Location = new System.Drawing.Point(170, 367);
+ this.okBtn.Name = "okBtn";
+ this.okBtn.Size = new System.Drawing.Size(75, 23);
+ this.okBtn.TabIndex = 3;
+ this.okBtn.Text = "Ok";
+ this.okBtn.UseVisualStyleBackColor = true;
+ this.okBtn.Click += new System.EventHandler(this.buttonEnable_Click);
//
- // extensionBox
- //
- this.extensionBox.BorderColor = System.Drawing.Color.Empty;
- this.extensionBox.Location = new System.Drawing.Point(135, 25);
- this.extensionBox.Name = "extensionBox";
- this.extensionBox.Size = new System.Drawing.Size(256, 20);
- this.extensionBox.TabIndex = 4;
- //
- // streamBox
- //
- this.streamBox.Location = new System.Drawing.Point(135, 52);
- this.streamBox.Name = "streamBox";
- this.streamBox.Size = new System.Drawing.Size(256, 20);
- this.streamBox.TabIndex = 5;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(6, 28);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(115, 13);
- this.label1.TabIndex = 6;
- this.label1.Text = "Associated extensions:";
- //
// groupBox1
//
this.groupBox1.Controls.Add(this.deintBox);
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.bufBox);
this.groupBox1.Controls.Add(this.label3);
- this.groupBox1.Controls.Add(this.label2);
- this.groupBox1.Controls.Add(this.label1);
- this.groupBox1.Controls.Add(this.streamBox);
- this.groupBox1.Controls.Add(this.extensionBox);
this.groupBox1.Location = new System.Drawing.Point(11, 12);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(411, 145);
+ this.groupBox1.Size = new System.Drawing.Size(222, 89);
this.groupBox1.TabIndex = 7;
this.groupBox1.TabStop = false;
- this.groupBox1.Text = "General";
+ this.groupBox1.Text = "General settings";
//
// deintBox
//
@@ -167,15 +201,15 @@
"Linear",
"Mean",
"X"});
- this.deintBox.Location = new System.Drawing.Point(135, 107);
+ this.deintBox.Location = new System.Drawing.Point(104, 50);
this.deintBox.Name = "deintBox";
- this.deintBox.Size = new System.Drawing.Size(256, 21);
+ this.deintBox.Size = new System.Drawing.Size(110, 21);
this.deintBox.TabIndex = 11;
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(6, 107);
+ this.label4.Location = new System.Drawing.Point(6, 54);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(64, 13);
this.label4.TabIndex = 10;
@@ -183,7 +217,7 @@
//
// bufBox
//
- this.bufBox.Location = new System.Drawing.Point(135, 80);
+ this.bufBox.Location = new System.Drawing.Point(104, 24);
this.bufBox.Name = "bufBox";
this.bufBox.Size = new System.Drawing.Size(59, 20);
this.bufBox.TabIndex = 9;
@@ -191,34 +225,398 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(6, 83);
+ this.label3.Location = new System.Drawing.Point(6, 24);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(59, 13);
+ this.label3.Size = new System.Drawing.Size(92, 13);
this.label3.TabIndex = 8;
- this.label3.Text = "Buffer size:";
+ this.label3.Text = "Buffer size (in ms):";
//
- // label2
+ // groupBox2
//
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(6, 55);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(108, 13);
- this.label2.TabIndex = 7;
- this.label2.Text = "Associated protocols:";
+ this.groupBox2.Controls.Add(this.audPanel);
+ this.groupBox2.Controls.Add(this.vidPanel);
+ this.groupBox2.Controls.Add(this.allAudBtn);
+ this.groupBox2.Controls.Add(this.allVidBtn);
+ this.groupBox2.Location = new System.Drawing.Point(239, 12);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(169, 349);
+ this.groupBox2.TabIndex = 8;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Associated extensions";
//
+ // audPanel
+ //
+ this.audPanel.Controls.Add(this.checkBox19);
+ this.audPanel.Controls.Add(this.checkBox20);
+ this.audPanel.Controls.Add(this.checkBox21);
+ this.audPanel.Controls.Add(this.checkBox22);
+ this.audPanel.Controls.Add(this.checkBox23);
+ this.audPanel.Controls.Add(this.checkBox14);
+ this.audPanel.Controls.Add(this.checkBox16);
+ this.audPanel.Controls.Add(this.checkBox17);
+ this.audPanel.Controls.Add(this.checkBox9);
+ this.audPanel.Controls.Add(this.checkBox4);
+ this.audPanel.Location = new System.Drawing.Point(86, 19);
+ this.audPanel.Name = "audPanel";
+ this.audPanel.Size = new System.Drawing.Size(74, 277);
+ this.audPanel.TabIndex = 26;
+ //
+ // checkBox19
+ //
+ this.checkBox19.AutoSize = true;
+ this.checkBox19.Location = new System.Drawing.Point(10, 100);
+ this.checkBox19.Name = "checkBox19";
+ this.checkBox19.Size = new System.Drawing.Size(40, 17);
+ this.checkBox19.TabIndex = 21;
+ this.checkBox19.Text = ".flv";
+ this.checkBox19.UseVisualStyleBackColor = true;
+ //
+ // checkBox20
+ //
+ this.checkBox20.AutoSize = true;
+ this.checkBox20.Location = new System.Drawing.Point(10, 77);
+ this.checkBox20.Name = "checkBox20";
+ this.checkBox20.Size = new System.Drawing.Size(46, 17);
+ this.checkBox20.TabIndex = 20;
+ this.checkBox20.Text = ".flac";
+ this.checkBox20.UseVisualStyleBackColor = true;
+ //
+ // checkBox21
+ //
+ this.checkBox21.AutoSize = true;
+ this.checkBox21.Location = new System.Drawing.Point(10, 31);
+ this.checkBox21.Name = "checkBox21";
+ this.checkBox21.Size = new System.Drawing.Size(47, 17);
+ this.checkBox21.TabIndex = 19;
+ this.checkBox21.Text = ".ac3";
+ this.checkBox21.UseVisualStyleBackColor = true;
+ //
+ // checkBox22
+ //
+ this.checkBox22.AutoSize = true;
+ this.checkBox22.Location = new System.Drawing.Point(10, 8);
+ this.checkBox22.Name = "checkBox22";
+ this.checkBox22.Size = new System.Drawing.Size(47, 17);
+ this.checkBox22.TabIndex = 18;
+ this.checkBox22.Text = ".aac";
+ this.checkBox22.UseVisualStyleBackColor = true;
+ //
+ // checkBox23
+ //
+ this.checkBox23.AutoSize = true;
+ this.checkBox23.Location = new System.Drawing.Point(10, 54);
+ this.checkBox23.Name = "checkBox23";
+ this.checkBox23.Size = new System.Drawing.Size(43, 17);
+ this.checkBox23.TabIndex = 17;
+ this.checkBox23.Text = ".dts";
+ this.checkBox23.UseVisualStyleBackColor = true;
+ //
+ // checkBox14
+ //
+ this.checkBox14.AutoSize = true;
+ this.checkBox14.Location = new System.Drawing.Point(10, 215);
+ this.checkBox14.Name = "checkBox14";
+ this.checkBox14.Size = new System.Drawing.Size(49, 17);
+ this.checkBox14.TabIndex = 16;
+ this.checkBox14.Text = ".wav";
+ this.checkBox14.UseVisualStyleBackColor = true;
+ //
+ // checkBox16
+ //
+ this.checkBox16.AutoSize = true;
+ this.checkBox16.Location = new System.Drawing.Point(10, 192);
+ this.checkBox16.Name = "checkBox16";
+ this.checkBox16.Size = new System.Drawing.Size(49, 17);
+ this.checkBox16.TabIndex = 14;
+ this.checkBox16.Text = ".ogm";
+ this.checkBox16.UseVisualStyleBackColor = true;
+ //
+ // checkBox17
+ //
+ this.checkBox17.AutoSize = true;
+ this.checkBox17.Location = new System.Drawing.Point(10, 169);
+ this.checkBox17.Name = "checkBox17";
+ this.checkBox17.Size = new System.Drawing.Size(47, 17);
+ this.checkBox17.TabIndex = 13;
+ this.checkBox17.Text = ".ogg";
+ this.checkBox17.UseVisualStyleBackColor = true;
+ //
+ // checkBox9
+ //
+ this.checkBox9.AutoSize = true;
+ this.checkBox9.Location = new System.Drawing.Point(10, 146);
+ this.checkBox9.Name = "checkBox9";
+ this.checkBox9.Size = new System.Drawing.Size(49, 17);
+ this.checkBox9.TabIndex = 6;
+ this.checkBox9.Text = ".mp3";
+ this.checkBox9.UseVisualStyleBackColor = true;
+ //
+ // checkBox4
+ //
+ this.checkBox4.AutoSize = true;
+ this.checkBox4.Location = new System.Drawing.Point(10, 123);
+ this.checkBox4.Name = "checkBox4";
+ this.checkBox4.Size = new System.Drawing.Size(49, 17);
+ this.checkBox4.TabIndex = 3;
+ this.checkBox4.Text = ".m4a";
+ this.checkBox4.UseVisualStyleBackColor = true;
+ //
+ // vidPanel
+ //
+ this.vidPanel.Controls.Add(this.checkBox27);
+ this.vidPanel.Controls.Add(this.checkBox15);
+ this.vidPanel.Controls.Add(this.checkBox10);
+ this.vidPanel.Controls.Add(this.checkBox11);
+ this.vidPanel.Controls.Add(this.checkBox13);
+ this.vidPanel.Controls.Add(this.checkBox7);
+ this.vidPanel.Controls.Add(this.checkBox8);
+ this.vidPanel.Controls.Add(this.checkBox6);
+ this.vidPanel.Controls.Add(this.checkBox5);
+ this.vidPanel.Controls.Add(this.checkBox3);
+ this.vidPanel.Controls.Add(this.checkBox2);
+ this.vidPanel.Controls.Add(this.checkBox1);
+ this.vidPanel.Location = new System.Drawing.Point(6, 19);
+ this.vidPanel.Name = "vidPanel";
+ this.vidPanel.Size = new System.Drawing.Size(74, 295);
+ this.vidPanel.TabIndex = 25;
+ //
+ // checkBox27
+ //
+ this.checkBox27.AutoSize = true;
+ this.checkBox27.Location = new System.Drawing.Point(8, 102);
+ this.checkBox27.Name = "checkBox27";
+ this.checkBox27.Size = new System.Drawing.Size(53, 17);
+ this.checkBox27.TabIndex = 24;
+ this.checkBox27.Text = ".h264";
+ this.checkBox27.UseVisualStyleBackColor = true;
+ //
+ // checkBox15
+ //
+ this.checkBox15.AutoSize = true;
+ this.checkBox15.Location = new System.Drawing.Point(8, 125);
+ this.checkBox15.Name = "checkBox15";
+ this.checkBox15.Size = new System.Drawing.Size(49, 17);
+ this.checkBox15.TabIndex = 15;
+ this.checkBox15.Text = ".mkv";
+ this.checkBox15.UseVisualStyleBackColor = true;
+ //
+ // checkBox10
+ //
+ this.checkBox10.AutoSize = true;
+ this.checkBox10.Location = new System.Drawing.Point(8, 10);
+ this.checkBox10.Name = "checkBox10";
+ this.checkBox10.Size = new System.Drawing.Size(47, 17);
+ this.checkBox10.TabIndex = 12;
+ this.checkBox10.Text = ".3gp";
+ this.checkBox10.UseVisualStyleBackColor = true;
+ //
+ // checkBox11
+ //
+ this.checkBox11.AutoSize = true;
+ this.checkBox11.Location = new System.Drawing.Point(8, 171);
+ this.checkBox11.Name = "checkBox11";
+ this.checkBox11.Size = new System.Drawing.Size(49, 17);
+ this.checkBox11.TabIndex = 11;
+ this.checkBox11.Text = ".mp4";
+ this.checkBox11.UseVisualStyleBackColor = true;
+ //
+ // checkBox7
+ //
+ this.checkBox7.AutoSize = true;
+ this.checkBox7.Location = new System.Drawing.Point(8, 240);
+ this.checkBox7.Name = "checkBox7";
+ this.checkBox7.Size = new System.Drawing.Size(51, 17);
+ this.checkBox7.TabIndex = 8;
+ this.checkBox7.Text = ".wma";
+ this.checkBox7.UseVisualStyleBackColor = true;
+ //
+ // checkBox8
+ //
+ this.checkBox8.AutoSize = true;
+ this.checkBox8.Location = new System.Drawing.Point(8, 33);
+ this.checkBox8.Name = "checkBox8";
+ this.checkBox8.Size = new System.Drawing.Size(43, 17);
+ this.checkBox8.TabIndex = 7;
+ this.checkBox8.Text = ".asf";
+ this.checkBox8.UseVisualStyleBackColor = true;
+ //
+ // checkBox6
+ //
+ this.checkBox6.AutoSize = true;
+ this.checkBox6.Location = new System.Drawing.Point(8, 194);
+ this.checkBox6.Name = "checkBox6";
+ this.checkBox6.Size = new System.Drawing.Size(49, 17);
+ this.checkBox6.TabIndex = 5;
+ this.checkBox6.Text = ".mpg";
+ this.checkBox6.UseVisualStyleBackColor = true;
+ //
+ // checkBox5
+ //
+ this.checkBox5.AutoSize = true;
+ this.checkBox5.Location = new System.Drawing.Point(8, 148);
+ this.checkBox5.Name = "checkBox5";
+ this.checkBox5.Size = new System.Drawing.Size(49, 17);
+ this.checkBox5.TabIndex = 4;
+ this.checkBox5.Text = ".mov";
+ this.checkBox5.UseVisualStyleBackColor = true;
+ //
+ // checkBox3
+ //
+ this.checkBox3.AutoSize = true;
+ this.checkBox3.Location = new System.Drawing.Point(8, 56);
+ this.checkBox3.Name = "checkBox3";
+ this.checkBox3.Size = new System.Drawing.Size(43, 17);
+ this.checkBox3.TabIndex = 2;
+ this.checkBox3.Text = ".avi";
+ this.checkBox3.UseVisualStyleBackColor = true;
+ //
+ // checkBox2
+ //
+ this.checkBox2.AutoSize = true;
+ this.checkBox2.Location = new System.Drawing.Point(8, 79);
+ this.checkBox2.Name = "checkBox2";
+ this.checkBox2.Size = new System.Drawing.Size(49, 17);
+ this.checkBox2.TabIndex = 1;
+ this.checkBox2.Text = ".gary";
+ this.checkBox2.UseVisualStyleBackColor = true;
+ //
+ // checkBox1
+ //
+ this.checkBox1.AutoSize = true;
+ this.checkBox1.Location = new System.Drawing.Point(8, 217);
+ this.checkBox1.Name = "checkBox1";
+ this.checkBox1.Size = new System.Drawing.Size(37, 17);
+ this.checkBox1.TabIndex = 0;
+ this.checkBox1.Text = ".ts";
+ this.checkBox1.UseVisualStyleBackColor = true;
+ //
+ // allAudBtn
+ //
+ this.allAudBtn.Location = new System.Drawing.Point(85, 320);
+ this.allAudBtn.Name = "allAudBtn";
+ this.allAudBtn.Size = new System.Drawing.Size(75, 23);
+ this.allAudBtn.TabIndex = 23;
+ this.allAudBtn.Text = "All audio";
+ this.allAudBtn.UseVisualStyleBackColor = true;
+ this.allAudBtn.Click += new System.EventHandler(this.allAudBtn_Click);
+ //
+ // allVidBtn
+ //
+ this.allVidBtn.Location = new System.Drawing.Point(6, 320);
+ this.allVidBtn.Name = "allVidBtn";
+ this.allVidBtn.Size = new System.Drawing.Size(75, 23);
+ this.allVidBtn.TabIndex = 22;
+ this.allVidBtn.Text = "All video";
+ this.allVidBtn.UseVisualStyleBackColor = true;
+ this.allVidBtn.Click += new System.EventHandler(this.allVidBtn_Click);
+ //
+ // checkBox13
+ //
+ this.checkBox13.AutoSize = true;
+ this.checkBox13.Location = new System.Drawing.Point(6, 263);
+ this.checkBox13.Name = "checkBox13";
+ this.checkBox13.Size = new System.Drawing.Size(51, 17);
+ this.checkBox13.TabIndex = 9;
+ this.checkBox13.Text = ".wmv";
+ this.checkBox13.UseVisualStyleBackColor = true;
+ //
+ // protBox
+ //
+ this.protBox.Controls.Add(this.httpOpt);
+ this.protBox.Controls.Add(this.udpOpt);
+ this.protBox.Controls.Add(this.rtspOpt);
+ this.protBox.Controls.Add(this.mmsOpt);
+ this.protBox.Location = new System.Drawing.Point(12, 109);
+ this.protBox.Name = "protBox";
+ this.protBox.Size = new System.Drawing.Size(221, 84);
+ this.protBox.TabIndex = 24;
+ this.protBox.TabStop = false;
+ this.protBox.Text = "Associated protocols";
+ //
+ // httpOpt
+ //
+ this.httpOpt.AutoSize = true;
+ this.httpOpt.Location = new System.Drawing.Point(8, 26);
+ this.httpOpt.Name = "httpOpt";
+ this.httpOpt.Size = new System.Drawing.Size(44, 17);
+ this.httpOpt.TabIndex = 12;
+ this.httpOpt.Text = "http";
+ this.httpOpt.UseVisualStyleBackColor = true;
+ //
+ // udpOpt
+ //
+ this.udpOpt.AutoSize = true;
+ this.udpOpt.Location = new System.Drawing.Point(8, 49);
+ this.udpOpt.Name = "udpOpt";
+ this.udpOpt.Size = new System.Drawing.Size(44, 17);
+ this.udpOpt.TabIndex = 7;
+ this.udpOpt.Text = "udp";
+ this.udpOpt.UseVisualStyleBackColor = true;
+ //
+ // rtspOpt
+ //
+ this.rtspOpt.AutoSize = true;
+ this.rtspOpt.Location = new System.Drawing.Point(71, 26);
+ this.rtspOpt.Name = "rtspOpt";
+ this.rtspOpt.Size = new System.Drawing.Size(43, 17);
+ this.rtspOpt.TabIndex = 2;
+ this.rtspOpt.Text = "rtsp";
+ this.rtspOpt.UseVisualStyleBackColor = true;
+ //
+ // mmsOpt
+ //
+ this.mmsOpt.AutoSize = true;
+ this.mmsOpt.Location = new System.Drawing.Point(71, 49);
+ this.mmsOpt.Name = "mmsOpt";
+ this.mmsOpt.Size = new System.Drawing.Size(47, 17);
+ this.mmsOpt.TabIndex = 1;
+ this.mmsOpt.Text = "mms";
+ this.mmsOpt.UseVisualStyleBackColor = true;
+ //
+ // cancelBtn
+ //
+ this.cancelBtn.Location = new System.Drawing.Point(251, 367);
+ this.cancelBtn.Name = "cancelBtn";
+ this.cancelBtn.Size = new System.Drawing.Size(75, 23);
+ this.cancelBtn.TabIndex = 25;
+ this.cancelBtn.Text = "Cancel";
+ this.cancelBtn.UseVisualStyleBackColor = true;
+ this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
+ //
+ // applyBtn
+ //
+ this.applyBtn.Location = new System.Drawing.Point(333, 367);
+ this.applyBtn.Name = "applyBtn";
+ this.applyBtn.Size = new System.Drawing.Size(75, 23);
+ this.applyBtn.TabIndex = 26;
+ this.applyBtn.Text = "Apply";
+ this.applyBtn.UseVisualStyleBackColor = true;
+ this.applyBtn.Click += new System.EventHandler(this.applyBtn_Click);
+ //
// ConfigurationForm
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
- this.ClientSize = new System.Drawing.Size(440, 198);
+ this.ClientSize = new System.Drawing.Size(417, 398);
+ this.Controls.Add(this.applyBtn);
+ this.Controls.Add(this.cancelBtn);
+ this.Controls.Add(this.protBox);
+ this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.buttonEnable);
+ this.Controls.Add(this.okBtn);
this.Name = "ConfigurationForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "Configuration";
+ this.Text = "VideoLan Player Configuration";
this.Closing += new System.ComponentModel.CancelEventHandler(this.ConfigurationForm_Closing);
this.Load += new System.EventHandler(this.ConfigurationForm_Load);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.audPanel.ResumeLayout(false);
+ this.audPanel.PerformLayout();
+ this.vidPanel.ResumeLayout(false);
+ this.vidPanel.PerformLayout();
+ this.protBox.ResumeLayout(false);
+ this.protBox.PerformLayout();
this.ResumeLayout(false);
}
@@ -228,24 +626,33 @@
{
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Directory.GetCurrentDirectory() + @"\MediaPortal.xml"))
{
- m_enabledExt = xmlreader.GetValueAsString("vlcplugin", "enabledextensions", ".ts,.gary");
- m_enabledStreams = xmlreader.GetValueAsString("vlcplugin", "enabledstreams", "udp");
+ string m_enabledExt = xmlreader.GetValueAsString("vlcplugin", "enabledextensions", ".ts,.gary");
+ string m_enabledStreams = xmlreader.GetValueAsString("vlcplugin", "enabledstreams", "udp");
bufsize = xmlreader.GetValueAsString("vlcplugin", "buffer", "5000");
m_deinterlace = xmlreader.GetValueAsString("vlcplugin", "deinterlace", "Disable");
m_enabledExt.Replace(":", ","); // in case it was using the old plugin code where the separator was ":"
+ if (m_enabledExt != null && m_enabledExt.Length > 0)
+ {
+ ArrayList extArrayList = new ArrayList();
+ ArrayList protArrayList = new ArrayList();
+ extArrayList.AddRange(m_enabledExt.Split(','));
+ protArrayList.AddRange(m_enabledStreams.Split(','));
+
+ foreach (CheckBox vbox in vidPanel.Controls)
+ if (extArrayList.Contains(vbox.Text)) vbox.Checked = true;
+ foreach (CheckBox abox in audPanel.Controls)
+ if (extArrayList.Contains(abox.Text)) abox.Checked = true;
+ foreach (CheckBox pbox in protBox.Controls)
+ if (protArrayList.Contains(pbox.Text)) pbox.Checked = true;
+ }
}
- if (m_enabledExt != null && m_enabledExt.Length > 0)
- extensionBox.Text = m_enabledExt;
-
- this.extensionBox.Text = m_enabledExt;
- this.streamBox.Text = m_enabledStreams;
this.bufBox.Text = bufsize;
this.deintBox.SelectedItem = m_deinterlace;
}
private void ConfigurationForm_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
- writeConfiguration();
+ if(!isCancelled) writeConfiguration();
}
private void buttonEnable_Click(object sender, System.EventArgs e)
@@ -254,15 +661,62 @@
this.Close();
}
- private void writeConfiguration()
- {
- using (MediaPortal.Profile.Settings xmlWriter = new MediaPortal.Profile.Settings(Directory.GetCurrentDirectory() + @"\MediaPortal.xml"))
- {
- xmlWriter.SetValue("vlcplugin", "enabledextensions", extensionBox.Text);
- xmlWriter.SetValue("vlcplugin", "enabledstreams", streamBox.Text);
- xmlWriter.SetValue("vlcplugin", "buffer", bufBox.Text);
- xmlWriter.SetValue("vlcplugin", "deinterlace", deintBox.Text);
- }
- }
+ private void allVidBtn_Click(object sender, EventArgs e)
+ {
+ foreach(CheckBox vbox in vidPanel.Controls)
+ {
+ vbox.Checked = true;
+ }
+ }
+
+ private void allAudBtn_Click(object sender, EventArgs e)
+ {
+ foreach (CheckBox abox in audPanel.Controls)
+ {
+ abox.Checked = true;
+ }
+ }
+
+ private void applyBtn_Click(object sender, EventArgs e)
+ {
+ writeConfiguration();
+ }
+
+ private void cancelBtn_Cl...
[truncated message content] |
|
From: <moi...@us...> - 2007-07-11 21:55:36
|
Revision: 683
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=683&view=rev
Author: moiristo
Date: 2007-07-11 14:55:32 -0700 (Wed, 11 Jul 2007)
Log Message:
-----------
Settings dialog update
Modified Paths:
--------------
trunk/plugins/VideoLAN/ConfigurationForm.cs
trunk/plugins/VideoLAN/VideoLAN.csproj
Modified: trunk/plugins/VideoLAN/ConfigurationForm.cs
===================================================================
--- trunk/plugins/VideoLAN/ConfigurationForm.cs 2007-07-11 20:31:36 UTC (rev 682)
+++ trunk/plugins/VideoLAN/ConfigurationForm.cs 2007-07-11 21:55:32 UTC (rev 683)
@@ -41,10 +41,8 @@
/// </summary>
public class ConfigurationForm : System.Windows.Forms.Form
{
- private string bufsize = "";
- private string m_deinterlace = "Disable";
private MediaPortal.UserInterface.Controls.MPButton okBtn;
- private GroupBox groupBox1;
+ private GroupBox transBox;
private TextBox bufBox;
private Label label3;
private Label label4;
@@ -84,6 +82,8 @@
private Panel audPanel;
private Panel vidPanel;
private bool isCancelled = false;
+ private ComboBox avBox;
+ private Label label1;
/// <summary>
/// Required designer variable.
/// </summary>
@@ -120,7 +120,9 @@
private void InitializeComponent()
{
this.okBtn = new MediaPortal.UserInterface.Controls.MPButton();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.transBox = new System.Windows.Forms.GroupBox();
+ this.avBox = new System.Windows.Forms.ComboBox();
+ this.label1 = new System.Windows.Forms.Label();
this.deintBox = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label();
this.bufBox = new System.Windows.Forms.TextBox();
@@ -142,6 +144,7 @@
this.checkBox15 = new System.Windows.Forms.CheckBox();
this.checkBox10 = new System.Windows.Forms.CheckBox();
this.checkBox11 = new System.Windows.Forms.CheckBox();
+ this.checkBox13 = new System.Windows.Forms.CheckBox();
this.checkBox7 = new System.Windows.Forms.CheckBox();
this.checkBox8 = new System.Windows.Forms.CheckBox();
this.checkBox6 = new System.Windows.Forms.CheckBox();
@@ -151,7 +154,6 @@
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.allAudBtn = new System.Windows.Forms.Button();
this.allVidBtn = new System.Windows.Forms.Button();
- this.checkBox13 = new System.Windows.Forms.CheckBox();
this.protBox = new System.Windows.Forms.GroupBox();
this.httpOpt = new System.Windows.Forms.CheckBox();
this.udpOpt = new System.Windows.Forms.CheckBox();
@@ -159,7 +161,7 @@
this.mmsOpt = new System.Windows.Forms.CheckBox();
this.cancelBtn = new System.Windows.Forms.Button();
this.applyBtn = new System.Windows.Forms.Button();
- this.groupBox1.SuspendLayout();
+ this.transBox.SuspendLayout();
this.groupBox2.SuspendLayout();
this.audPanel.SuspendLayout();
this.vidPanel.SuspendLayout();
@@ -168,7 +170,7 @@
//
// okBtn
//
- this.okBtn.Location = new System.Drawing.Point(170, 367);
+ this.okBtn.Location = new System.Drawing.Point(191, 358);
this.okBtn.Name = "okBtn";
this.okBtn.Size = new System.Drawing.Size(75, 23);
this.okBtn.TabIndex = 3;
@@ -176,19 +178,45 @@
this.okBtn.UseVisualStyleBackColor = true;
this.okBtn.Click += new System.EventHandler(this.buttonEnable_Click);
//
- // groupBox1
+ // transBox
//
- this.groupBox1.Controls.Add(this.deintBox);
- this.groupBox1.Controls.Add(this.label4);
- this.groupBox1.Controls.Add(this.bufBox);
- this.groupBox1.Controls.Add(this.label3);
- this.groupBox1.Location = new System.Drawing.Point(11, 12);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(222, 89);
- this.groupBox1.TabIndex = 7;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "General settings";
+ this.transBox.Controls.Add(this.avBox);
+ this.transBox.Controls.Add(this.label1);
+ this.transBox.Controls.Add(this.deintBox);
+ this.transBox.Controls.Add(this.label4);
+ this.transBox.Controls.Add(this.bufBox);
+ this.transBox.Controls.Add(this.label3);
+ this.transBox.Location = new System.Drawing.Point(11, 4);
+ this.transBox.Name = "transBox";
+ this.transBox.Size = new System.Drawing.Size(241, 102);
+ this.transBox.TabIndex = 7;
+ this.transBox.TabStop = false;
+ this.transBox.Text = "General settings";
//
+ // avBox
+ //
+ this.avBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.avBox.FormattingEnabled = true;
+ this.avBox.Items.AddRange(new object[] {
+ "Disable",
+ "Goom",
+ "Scope",
+ "Spectrometer",
+ "Spectrum"});
+ this.avBox.Location = new System.Drawing.Point(112, 72);
+ this.avBox.Name = "avBox";
+ this.avBox.Size = new System.Drawing.Size(123, 21);
+ this.avBox.TabIndex = 13;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(4, 75);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(102, 13);
+ this.label1.TabIndex = 12;
+ this.label1.Text = "Audio visualizations:";
+ //
// deintBox
//
this.deintBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -201,15 +229,16 @@
"Linear",
"Mean",
"X"});
- this.deintBox.Location = new System.Drawing.Point(104, 50);
+ this.deintBox.Location = new System.Drawing.Point(112, 43);
this.deintBox.Name = "deintBox";
this.deintBox.Size = new System.Drawing.Size(110, 21);
this.deintBox.TabIndex = 11;
+ this.deintBox.SelectedIndexChanged += new System.EventHandler(this.deintBox_SelectedIndexChanged);
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(6, 54);
+ this.label4.Location = new System.Drawing.Point(4, 46);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(64, 13);
this.label4.TabIndex = 10;
@@ -217,7 +246,7 @@
//
// bufBox
//
- this.bufBox.Location = new System.Drawing.Point(104, 24);
+ this.bufBox.Location = new System.Drawing.Point(112, 17);
this.bufBox.Name = "bufBox";
this.bufBox.Size = new System.Drawing.Size(59, 20);
this.bufBox.TabIndex = 9;
@@ -225,7 +254,7 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(6, 24);
+ this.label3.Location = new System.Drawing.Point(4, 20);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(92, 13);
this.label3.TabIndex = 8;
@@ -237,9 +266,9 @@
this.groupBox2.Controls.Add(this.vidPanel);
this.groupBox2.Controls.Add(this.allAudBtn);
this.groupBox2.Controls.Add(this.allVidBtn);
- this.groupBox2.Location = new System.Drawing.Point(239, 12);
+ this.groupBox2.Location = new System.Drawing.Point(258, 2);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(169, 349);
+ this.groupBox2.Size = new System.Drawing.Size(169, 350);
this.groupBox2.TabIndex = 8;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Associated extensions";
@@ -420,6 +449,16 @@
this.checkBox11.Text = ".mp4";
this.checkBox11.UseVisualStyleBackColor = true;
//
+ // checkBox13
+ //
+ this.checkBox13.AutoSize = true;
+ this.checkBox13.Location = new System.Drawing.Point(6, 263);
+ this.checkBox13.Name = "checkBox13";
+ this.checkBox13.Size = new System.Drawing.Size(51, 17);
+ this.checkBox13.TabIndex = 9;
+ this.checkBox13.Text = ".wmv";
+ this.checkBox13.UseVisualStyleBackColor = true;
+ //
// checkBox7
//
this.checkBox7.AutoSize = true;
@@ -510,28 +549,18 @@
this.allVidBtn.UseVisualStyleBackColor = true;
this.allVidBtn.Click += new System.EventHandler(this.allVidBtn_Click);
//
- // checkBox13
- //
- this.checkBox13.AutoSize = true;
- this.checkBox13.Location = new System.Drawing.Point(6, 263);
- this.checkBox13.Name = "checkBox13";
- this.checkBox13.Size = new System.Drawing.Size(51, 17);
- this.checkBox13.TabIndex = 9;
- this.checkBox13.Text = ".wmv";
- this.checkBox13.UseVisualStyleBackColor = true;
- //
// protBox
//
this.protBox.Controls.Add(this.httpOpt);
this.protBox.Controls.Add(this.udpOpt);
this.protBox.Controls.Add(this.rtspOpt);
this.protBox.Controls.Add(this.mmsOpt);
- this.protBox.Location = new System.Drawing.Point(12, 109);
+ this.protBox.Location = new System.Drawing.Point(12, 111);
this.protBox.Name = "protBox";
- this.protBox.Size = new System.Drawing.Size(221, 84);
+ this.protBox.Size = new System.Drawing.Size(240, 73);
this.protBox.TabIndex = 24;
this.protBox.TabStop = false;
- this.protBox.Text = "Associated protocols";
+ this.protBox.Text = "Associated input protocols";
//
// httpOpt
//
@@ -575,7 +604,7 @@
//
// cancelBtn
//
- this.cancelBtn.Location = new System.Drawing.Point(251, 367);
+ this.cancelBtn.Location = new System.Drawing.Point(272, 358);
this.cancelBtn.Name = "cancelBtn";
this.cancelBtn.Size = new System.Drawing.Size(75, 23);
this.cancelBtn.TabIndex = 25;
@@ -585,7 +614,7 @@
//
// applyBtn
//
- this.applyBtn.Location = new System.Drawing.Point(333, 367);
+ this.applyBtn.Location = new System.Drawing.Point(352, 358);
this.applyBtn.Name = "applyBtn";
this.applyBtn.Size = new System.Drawing.Size(75, 23);
this.applyBtn.TabIndex = 26;
@@ -596,20 +625,20 @@
// ConfigurationForm
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
- this.ClientSize = new System.Drawing.Size(417, 398);
+ this.ClientSize = new System.Drawing.Size(438, 386);
this.Controls.Add(this.applyBtn);
this.Controls.Add(this.cancelBtn);
this.Controls.Add(this.protBox);
this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.transBox);
this.Controls.Add(this.okBtn);
this.Name = "ConfigurationForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "VideoLan Player Configuration";
this.Closing += new System.ComponentModel.CancelEventHandler(this.ConfigurationForm_Closing);
this.Load += new System.EventHandler(this.ConfigurationForm_Load);
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
+ this.transBox.ResumeLayout(false);
+ this.transBox.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.audPanel.ResumeLayout(false);
this.audPanel.PerformLayout();
@@ -626,10 +655,13 @@
{
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Directory.GetCurrentDirectory() + @"\MediaPortal.xml"))
{
+ bool transcode = xmlreader.GetValueAsBool("vlcplugin", "transcode", false);
+ string audiovisual = xmlreader.GetValueAsString("vlcplugin", "visual", "Disable");
+ string out_protocol = xmlreader.GetValueAsString("vlcplugin", "protocol", "Leave unchanged");
string m_enabledExt = xmlreader.GetValueAsString("vlcplugin", "enabledextensions", ".ts,.gary");
string m_enabledStreams = xmlreader.GetValueAsString("vlcplugin", "enabledstreams", "udp");
- bufsize = xmlreader.GetValueAsString("vlcplugin", "buffer", "5000");
- m_deinterlace = xmlreader.GetValueAsString("vlcplugin", "deinterlace", "Disable");
+ string bufsize = xmlreader.GetValueAsString("vlcplugin", "buffer", "5000");
+ string m_deinterlace = xmlreader.GetValueAsString("vlcplugin", "deinterlace", "Disable");
m_enabledExt.Replace(":", ","); // in case it was using the old plugin code where the separator was ":"
if (m_enabledExt != null && m_enabledExt.Length > 0)
{
@@ -645,9 +677,10 @@
foreach (CheckBox pbox in protBox.Controls)
if (protArrayList.Contains(pbox.Text)) pbox.Checked = true;
}
- }
this.bufBox.Text = bufsize;
this.deintBox.SelectedItem = m_deinterlace;
+ this.avBox.Text = audiovisual;
+ }
}
private void ConfigurationForm_Closing(object sender, System.ComponentModel.CancelEventArgs e)
@@ -692,6 +725,7 @@
{
using (MediaPortal.Profile.Settings xmlWriter = new MediaPortal.Profile.Settings(Directory.GetCurrentDirectory() + @"\MediaPortal.xml"))
{
+ xmlWriter.SetValue("vlcplugin", "visual", avBox.Text);
xmlWriter.SetValue("vlcplugin", "enabledextensions", getCheckedExtensions());
xmlWriter.SetValue("vlcplugin", "enabledstreams", getCheckedProtocols());
xmlWriter.SetValue("vlcplugin", "buffer", bufBox.Text);
@@ -718,5 +752,10 @@
return result.Substring(0, result.Length - 1);
}
+
+ private void deintBox_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ }
}
}
Modified: trunk/plugins/VideoLAN/VideoLAN.csproj
===================================================================
--- trunk/plugins/VideoLAN/VideoLAN.csproj 2007-07-11 20:31:36 UTC (rev 682)
+++ trunk/plugins/VideoLAN/VideoLAN.csproj 2007-07-11 21:55:32 UTC (rev 683)
@@ -36,18 +36,22 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\AXVLC.dll</HintPath>
</Reference>
- <Reference Include="Core, Version=1.0.2546.32606, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Core, Version=1.0.2586.6922, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>C:\Program Files (x86)\MediaPortal\Core.DLL</HintPath>
+ <HintPath>..\..\trunk\mediaportal\Dialogs\bin\Release\Core.dll</HintPath>
</Reference>
+ <Reference Include="Dialogs, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\trunk\mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=1.0.2546.32604, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Utils, Version=1.0.2586.6921, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>C:\Program Files (x86)\MediaPortal\Utils.DLL</HintPath>
+ <HintPath>..\..\trunk\mediaportal\Dialogs\bin\Release\Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|