Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4079] trunk/plugins/AndroidRemote
|
From: <kro...@us...> - 2011-01-24 20:11:41
|
Revision: 4079
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4079&view=rev
Author: kroko_koenig
Date: 2011-01-24 20:11:34 +0000 (Mon, 24 Jan 2011)
Log Message:
-----------
changed mime type for mp3 playback
add vlc profiles
uses video extensions
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/movies/Movies.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicResults.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicSong.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/TopExceptionHandler.java
trunk/plugins/AndroidRemote/Release/Android Server communication.docx
trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1
trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2
trunk/plugins/AndroidRemote/Release/MediaPortalRemote.zip
trunk/plugins/AndroidRemote/Release/setup2.jpg
trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidServer.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/ExecuteCommand.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/VideoHandler.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Added Paths:
-----------
trunk/plugins/AndroidRemote/Release/320x160.opt
trunk/plugins/AndroidRemote/Release/400x240.opt
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme 2011-01-23 21:10:56 UTC (rev 4078)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme 2011-01-24 20:11:34 UTC (rev 4079)
@@ -61,12 +61,11 @@
NowPlaying list show actual / count of items on top bar
add gfx
-NEW (after 2nd)
- fix for folder like //pictures//pictures//bla...
- fix display folder %20
- pointer for thumb caching always to zero on execute fetching
- removed brush to have better contrast
-ActivityNotFoundException (MP3) added chooser
-IndexOutOfBoundsException (pictures) hopefully now changed
+- add profiles for vlc (server)
+- use video extensions list
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/movies/Movies.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/movies/Movies.java 2011-01-23 21:10:56 UTC (rev 4078)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/movies/Movies.java 2011-01-24 20:11:34 UTC (rev 4079)
@@ -219,7 +219,7 @@
// automatically done on worker thread (separate from UI thread)
protected Void doInBackground(final String... args) {
try {
- Thread.sleep(3000);
+ Thread.sleep(4000);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java 2011-01-23 21:10:56 UTC (rev 4078)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java 2011-01-24 20:11:34 UTC (rev 4079)
@@ -129,7 +129,7 @@
+ selectedItem.File.replaceAll(" ", "%20");
Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.setDataAndType(Uri.parse(link), "audio/mp3");
+ intent.setDataAndType(Uri.parse(link), "audio/mpeg");
startActivity(intent);
break;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicResults.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicResults.java 2011-01-23 21:10:56 UTC (rev 4078)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicResults.java 2011-01-24 20:11:34 UTC (rev 4079)
@@ -133,7 +133,7 @@
+ ":" + AppSettings.getPort() + "/db_music/getfile?id=" + selectedItem.ID;
Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.setDataAndType(Uri.parse(link), "audio/mp3");
+ intent.setDataAndType(Uri.parse(link), "audio/mpeg");
startActivity(Intent
.createChooser(intent, "Choose player :"));
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicSong.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicSong.java 2011-01-23 21:10:56 UTC (rev 4078)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicSong.java 2011-01-24 20:11:34 UTC (rev 4079)
@@ -121,7 +121,7 @@
+ ":" + AppSettings.getPort() + "/db_music/getfile?id=" + selectedItem.ID;
Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.setDataAndType(Uri.parse(link), "audio/mp3");
+ intent.setDataAndType(Uri.parse(link), "audio/mpeg");
startActivity(Intent
.createChooser(intent, "Choose player :"));
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java 2011-01-23 21:10:56 UTC (rev 4078)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java 2011-01-24 20:11:34 UTC (rev 4079)
@@ -209,7 +209,8 @@
String file = server + actualDir.replaceAll(" ", "%20")
+ item.File + ".thb";
item.Picture = http.DownloadImage(file);
- pictureList.set(picNo, item);
+ if (picNo < pictureList.size()) // very strange exeption happens here 10/10
+ pictureList.set(picNo, item);
break;
}
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/TopExceptionHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/TopExceptionHandler.java 2011-01-23 21:10:56 UTC (rev 4078)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/TopExceptionHandler.java 2011-01-24 20:11:34 UTC (rev 4079)
@@ -59,7 +59,7 @@
}
report += "-------------------------------\n\n";
- report += "Remote Version : 23.01 / 22:00\n\n";
+ report += "Remote Version : 24.01 / 21:00\n\n";
report += "-------------------------------\n\n";
report += "--------- Device ---------\n\n";
report += "Brand: " + Build.BRAND + "\n";
Added: trunk/plugins/AndroidRemote/Release/320x160.opt
===================================================================
--- trunk/plugins/AndroidRemote/Release/320x160.opt (rev 0)
+++ trunk/plugins/AndroidRemote/Release/320x160.opt 2011-01-24 20:11:34 UTC (rev 4079)
@@ -0,0 +1 @@
+--audio-desync=-50 --no-sout-rtp-sap --sout-transcode-fps=15 --sout-rtp-caching=2000 --sout-transcode-threads=4 --sout-transcode-high-priority --sout-keep --sout=#transcode{venc=x264{profile=baseline,level=3,keyint=50,bframes=0,no-cabac,ref=1,no-interlaced,vbv-maxrate=600,vbv-bufsize=256,aq-mode=0,no-mbtree,partitions=none,no-weightb,weightp=0,me=dia,subme=0,no-mixed-refs,no-8x8dct,trellis=0},vcodec=h264,vb=600,vfilter=canvas{width=320,height=160,aspect=320:160,padd},soverlay,aenc=ffmpeg{aac-profile=low},acodec=mp4a,ab=96,channels=2,audio-sync}:gather:rtp{sdp=rtsp://0.0.0.0:5554/MediaPortal.sdp,mp4a-latm}
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Release/400x240.opt
===================================================================
--- trunk/plugins/AndroidRemote/Release/400x240.opt (rev 0)
+++ trunk/plugins/AndroidRemote/Release/400x240.opt 2011-01-24 20:11:34 UTC (rev 4079)
@@ -0,0 +1 @@
+--audio-desync=-50 --no-sout-rtp-sap --sout-transcode-fps=15 --sout-rtp-caching=2000 --sout-transcode-threads=4 --sout-transcode-high-priority --sout-keep --sout=#transcode{venc=x264{profile=baseline,level=3,keyint=50,bframes=0,no-cabac,ref=1,no-interlaced,vbv-maxrate=600,vbv-bufsize=256,aq-mode=0,no-mbtree,partitions=none,no-weightb,weightp=0,me=dia,subme=0,no-mixed-refs,no-8x8dct,trellis=0},vcodec=h264,vb=600,vfilter=canvas{width=400,height=240,aspect=400:240,padd},soverlay,aenc=ffmpeg{aac-profile=low},acodec=mp4a,ab=96,channels=2,audio-sync}:gather:rtp{sdp=rtsp://0.0.0.0:5554/MediaPortal.sdp,mp4a-latm}
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Release/Android Server communication.docx
===================================================================
(Binary files differ)
Modified: trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2
===================================================================
--- trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2 2011-01-23 21:10:56 UTC (rev 4078)
+++ trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2 2011-01-24 20:11:34 UTC (rev 4079)
@@ -24,6 +24,20 @@
<ZipFileName>Installer{CopyFile}\{b71d0b6b-5613-449f-98a4-50dee3c65c8c}-VideoLan.Interop.dll</ZipFileName>
<DestinationFilename>%Plugins%\process\VideoLan.Interop.dll</DestinationFilename>
</FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>320x160.opt</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d83ef543-b029-4580-8919-c17047dd95f3}-320x160.opt</ZipFileName>
+ <DestinationFilename>%Plugins%\process\320x160.opt</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>400x240.opt</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{377f216a-a2c1-4dfe-aeb3-5ba04e448c72}-400x240.opt</ZipFileName>
+ <DestinationFilename>%Plugins%\process\400x240.opt</DestinationFilename>
+ </FileItem>
</Items>
</Files>
</GroupItem>
@@ -146,14 +160,14 @@
<Version>
<Major>0</Major>
<Minor>2</Minor>
- <Build>0</Build>
+ <Build>1</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Control your MediaPortal with yout Android. It can be used as a remote control or doing many other things like music, pictures and video control.
Gfx has been done by oddfella and some additional coding is from rolls1400.
Have fun.</ExtensionDescription>
- <VersionDescription>add video support, bug fixes, extend remote control</VersionDescription>
+ <VersionDescription>uses video exentions, tweaked vlc settings</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation />
<ReleaseDate>2010-12-09T16:17:18.1693243+01:00</ReleaseDate>
@@ -207,6 +221,20 @@
<ZipFileName>Installer{CopyFile}\{b71d0b6b-5613-449f-98a4-50dee3c65c8c}-VideoLan.Interop.dll</ZipFileName>
<DestinationFilename>%Plugins%\process\VideoLan.Interop.dll</DestinationFilename>
</FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>320x160.opt</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d83ef543-b029-4580-8919-c17047dd95f3}-320x160.opt</ZipFileName>
+ <DestinationFilename>%Plugins%\process\320x160.opt</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>400x240.opt</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{377f216a-a2c1-4dfe-aeb3-5ba04e448c72}-400x240.opt</ZipFileName>
+ <DestinationFilename>%Plugins%\process\400x240.opt</DestinationFilename>
+ </FileItem>
</Items>
</UniqueFileList>
<ProjectSettings>
Modified: trunk/plugins/AndroidRemote/Release/MediaPortalRemote.zip
===================================================================
(Binary files differ)
Modified: trunk/plugins/AndroidRemote/Release/setup2.jpg
===================================================================
(Binary files differ)
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidServer.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidServer.cs 2011-01-23 21:10:56 UTC (rev 4078)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidServer.cs 2011-01-24 20:11:34 UTC (rev 4079)
@@ -25,6 +25,7 @@
using System;
using System.Collections.Generic;
using System.Text;
+using System.IO;
using MediaPortal.Configuration;
using MediaPortal.GUI.Library;
@@ -45,8 +46,10 @@
private TcpListener myListener;
public static string Server = string.Empty;
public static string Port = string.Empty;
- public static string VlcFile = string.Empty;
+ private string VlcFile = string.Empty;
+ public static string VideoExtension = string.Empty;
+
private Thread listen;
private Thread grabPictures;
private Thread cacheDB;
@@ -76,7 +79,7 @@
cacheDB.Priority = ThreadPriority.Lowest;
cacheDB.Start();
- logInfo("Init vlc palyer");
+ logInfo("Init vlc player");
string sVlcPath;
Microsoft.Win32.RegistryKey regkeyVlcInstallPathKey = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(@"SOFTWARE\VideoLAN\VLC");
@@ -93,21 +96,28 @@
"--sout-transcode-threads=4",
"--sout-transcode-high-priority",
"--sout-keep",
- "--sout=#duplicate{dst='transcode{venc=x264{profile=baseline,level=3,keyint=30,bframes=0,no-cabac,ref=1,no-interlaced,vbv-maxrate=512,vbv-bufsize=256,aq-mode=0,no-mbtree,partitions=none,no-weightb,weightp=0,me=dia,subme=0,no-mixed-refs,no-8x8dct,trellis=0},vcodec=h264,vb=512,vfilter=canvas{width=320,height=160,aspect=320:160,padd},soverlay,aenc=ffmpeg{aac-profile=low},acodec=mp4a,ab=96,channels=2,audio-sync}:gather:rtp{sdp=rtsp://0.0.0.0:5554/MediaPortal.sdp,mp4a-latm}',dst='transcode{vcodec=null,acodec=mp3,ab=160,channels=2}:gather:std{access=http,mux=raw,dst=0.0.0.0:8081}'}",
- "-I",
- "dumy",
- "--no-ignore-config",
- "--no-osd",
- //"--plugin-path=" + System.IO.Path.Combine(sVlcPath , "plugins")
+ "--sout=#duplicate{dst='transcode{venc=x264{profile=baseline,level=3,keyint=30,bframes=0,no-cabac,ref=1,no-interlaced,vbv-maxrate=512,vbv-bufsize=256,aq-mode=0,no-mbtree,partitions=none,no-weightb,weightp=0,me=dia,subme=0,no-mixed-refs,no-8x8dct,trellis=0},vcodec=h264,vb=512,vfilter=canvas{width=320,height=160,aspect=320:160,padd},soverlay,aenc=ffmpeg{aac-profile=low},acodec=mp4a,ab=96,channels=2,audio-sync}:gather:rtp{sdp=rtsp://0.0.0.0:5554/MediaPortal.sdp,mp4a-latm}',dst='transcode{vcodec=null,acodec=mp3,ab=160,channels=2}:gather:std{access=http,mux=raw,dst=0.0.0.0:8081}'}"
};
- AndroidServer.vlc = new VideoLan.VlcControl(args);
- AndroidServer.vlc.Visible = false;
- GUIGraphicsContext.form.Controls.Add(AndroidServer.vlc);
+ string option = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Plugins) + "\\process\\" + VlcFile;
+ if (File.Exists(option))
+ {
+ logInfo("Load vlc profile " + VlcFile);
+
+ StreamReader sr = new StreamReader(option);
+ string read = sr.ReadToEnd();
+ sr.Close();
+
+ args = read.Split(' ');
+ }
+
+ vlc = new VideoLan.VlcControl(args);
+ vlc.Visible = false;
+
+ GUIGraphicsContext.form.Controls.Add(vlc);
}
}
-
public void Stop()
{
logInfo("Stop server");
@@ -122,7 +132,9 @@
{
Server = xmlreader.GetValueAsString("android", "server", "192.168.0.30");
Port = xmlreader.GetValueAsString("android", "port", "8200");
- VlcFile = xmlreader.GetValueAsString("android", "file", "");
+
+ VlcFile = xmlreader.GetValueAsString("android", "vlc", "320x160.opt");
+ VideoExtension = xmlreader.GetValueAsString("movies", "extensions", ".avi,.mpg,.flv,.mp4");
}
}
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/ExecuteCommand.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/ExecuteCommand.cs 2011-01-23 21:10:56 UTC (rev 4078)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/ExecuteCommand.cs 2011-01-24 20:11:34 UTC (rev 4079)
@@ -564,7 +564,11 @@
{
if (AndroidServer.vlc != null)
{
- if (AndroidServer.vlc.IsPlaying) AndroidServer.vlc.Stop();
+ if (AndroidServer.vlc.IsPlaying)
+ {
+ AndroidServer.vlc.Stop();
+ System.Threading.Thread.Sleep(100);
+ }
string filename = data["filename"].Replace("/", "\\");
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/VideoHandler.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/VideoHandler.cs 2011-01-23 21:10:56 UTC (rev 4078)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/VideoHandler.cs 2011-01-24 20:11:34 UTC (rev 4079)
@@ -145,12 +145,12 @@
private static ArrayList getAllpattern(string Dir)
{
- string[] filters = { "*.avi", "*.mpg", "*.flv" , "*.mp4" };
+ string[] filters = AndroidServer.VideoExtension.Split(',');
+
ArrayList files = new ArrayList();
-
foreach (string filter in filters)
{
- files.AddRange(Directory.GetFiles(Dir, filter));
+ files.AddRange(Directory.GetFiles(Dir, "*" + filter));
}
return files;
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs 2011-01-23 21:10:56 UTC (rev 4078)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs 2011-01-24 20:11:34 UTC (rev 4079)
@@ -39,7 +39,8 @@
this.btnSave = new System.Windows.Forms.Button();
this.btnCancel = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.label3 = new System.Windows.Forms.Label();
+ this.btnBrowse = new System.Windows.Forms.Button();
+ this.txtVlc = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.SuspendLayout();
@@ -150,24 +151,37 @@
//
// groupBox2
//
- this.groupBox2.Controls.Add(this.label3);
+ this.groupBox2.Controls.Add(this.txtVlc);
+ this.groupBox2.Controls.Add(this.btnBrowse);
this.groupBox2.Location = new System.Drawing.Point(12, 114);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(491, 66);
this.groupBox2.TabIndex = 3;
this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Streaming";
+ this.groupBox2.Text = "Streaming Profile";
//
- // label3
+ // btnBrowse
//
- this.label3.AutoSize = true;
- this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label3.Location = new System.Drawing.Point(14, 29);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(396, 16);
- this.label3.TabIndex = 7;
- this.label3.Text = "VLC parameter can be found in the vlc.par in the process directory";
+ this.btnBrowse.Location = new System.Drawing.Point(287, 19);
+ this.btnBrowse.Name = "btnBrowse";
+ this.btnBrowse.Size = new System.Drawing.Size(137, 23);
+ this.btnBrowse.TabIndex = 0;
+ this.btnBrowse.Text = "Browse profiles";
+ this.btnBrowse.UseVisualStyleBackColor = true;
+ this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click);
//
+ // txtVlc
+ //
+ this.txtVlc.BackColor = System.Drawing.Color.White;
+ this.txtVlc.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.txtVlc.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txtVlc.Location = new System.Drawing.Point(14, 22);
+ this.txtVlc.Name = "txtVlc";
+ this.txtVlc.Size = new System.Drawing.Size(249, 25);
+ this.txtVlc.TabIndex = 7;
+ this.txtVlc.Text = "Profile";
+ this.txtVlc.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
// Setup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -190,7 +204,6 @@
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
this.ResumeLayout(false);
}
@@ -208,6 +221,7 @@
private System.Windows.Forms.Button btnCopy;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Button btnBrowse;
+ private System.Windows.Forms.Label txtVlc;
}
}
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs 2011-01-23 21:10:56 UTC (rev 4078)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs 2011-01-24 20:11:34 UTC (rev 4079)
@@ -63,6 +63,8 @@
{
txtServer.Text = xmlreader.GetValueAsString("android", "server", "192.168.0.30");
txtPort.Text = xmlreader.GetValueAsString("android", "port", "8200");
+
+ txtVlc.Text = xmlreader.GetValueAsString("android", "vlc", "320x160.opt");
}
}
private void SaveSettings()
@@ -72,6 +74,8 @@
{
xmlwriter.SetValue("android", "server", txtServer.Text);
xmlwriter.SetValue("android", "port", txtPort.Text);
+
+ xmlwriter.SetValue("android", "vlc", txtVlc.Text);
}
}
@@ -94,5 +98,22 @@
{
}
+
+ private void btnBrowse_Click(object sender, EventArgs e)
+ {
+
+ string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Plugins) + "\\process";
+
+ OpenFileDialog openFile1 = new OpenFileDialog();
+ openFile1.Filter = "VLC profiles|*.opt";
+ openFile1.InitialDirectory = dir;
+ openFile1.FileName = txtVlc.Text;
+
+ if (openFile1.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ txtVlc.Text = Path.GetFileName(openFile1.FileName);
+ }
+
+ }
}
}
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
