Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1321] trunk/plugins/OnlineVideos/Source/ OnlineVideos
|
From: <gre...@us...> - 2008-01-28 22:27:58
|
Revision: 1321
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1321&view=rev
Author: gregmac45
Date: 2008-01-28 14:27:53 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/OnlineVideos/Source/OnlineVideos/Configuration.Designer.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Configuration.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/ImageDowloader.cs
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/Configuration.Designer.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/Configuration.Designer.cs 2008-01-28 22:25:52 UTC (rev 1320)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/Configuration.Designer.cs 2008-01-28 22:27:53 UTC (rev 1321)
@@ -37,393 +37,380 @@
/// </summary>
private void InitializeComponent()
{
- this.tabControl1 = new System.Windows.Forms.TabControl();
- this.General_Tab = new System.Windows.Forms.TabPage();
- this.label4 = new System.Windows.Forms.Label();
- this.cmbTrailerSize = new System.Windows.Forms.ComboBox();
- this.txtDownloadDir = new System.Windows.Forms.TextBox();
- this.label3 = new System.Windows.Forms.Label();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.btnAdd = new System.Windows.Forms.Button();
- this.CategoryList = new System.Windows.Forms.ListBox();
- this.btnDeleteRss = new System.Windows.Forms.Button();
- this.txtRssUrl = new System.Windows.Forms.TextBox();
- this.btnRssSave = new System.Windows.Forms.Button();
- this.label26 = new System.Windows.Forms.Label();
- this.txtRssName = new System.Windows.Forms.TextBox();
- this.label25 = new System.Windows.Forms.Label();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.txtPassword = new System.Windows.Forms.TextBox();
- this.txtUserId = new System.Windows.Forms.TextBox();
- this.chkAgeConfirm = new System.Windows.Forms.CheckBox();
- this.label30 = new System.Windows.Forms.Label();
- this.label29 = new System.Windows.Forms.Label();
- this.btnSiteSave = new System.Windows.Forms.Button();
- this.TxtSiteId = new System.Windows.Forms.TextBox();
- this.txtSiteName = new System.Windows.Forms.TextBox();
- this.label28 = new System.Windows.Forms.Label();
- this.label27 = new System.Windows.Forms.Label();
- this.siteList = new System.Windows.Forms.ListBox();
- this.chkEnabled = new System.Windows.Forms.CheckBox();
- this.txtFilters = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
- this.txtThumbLoc = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
- this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
- this.tabControl1.SuspendLayout();
- this.General_Tab.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.groupBox1.SuspendLayout();
- this.SuspendLayout();
- //
- // tabControl1
- //
- this.tabControl1.Controls.Add(this.General_Tab);
- this.tabControl1.Location = new System.Drawing.Point(17, 16);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
- this.tabControl1.Name = "tabControl1";
- this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(639, 715);
- this.tabControl1.TabIndex = 0;
- //
- // General_Tab
- //
- this.General_Tab.Controls.Add(this.label4);
- this.General_Tab.Controls.Add(this.cmbTrailerSize);
- this.General_Tab.Controls.Add(this.txtDownloadDir);
- this.General_Tab.Controls.Add(this.label3);
- this.General_Tab.Controls.Add(this.groupBox2);
- this.General_Tab.Controls.Add(this.groupBox1);
- this.General_Tab.Controls.Add(this.txtFilters);
- this.General_Tab.Controls.Add(this.label2);
- this.General_Tab.Controls.Add(this.txtThumbLoc);
- this.General_Tab.Controls.Add(this.label1);
- this.General_Tab.Location = new System.Drawing.Point(4, 25);
- this.General_Tab.Margin = new System.Windows.Forms.Padding(4);
- this.General_Tab.Name = "General_Tab";
- this.General_Tab.Padding = new System.Windows.Forms.Padding(4);
- this.General_Tab.Size = new System.Drawing.Size(631, 686);
- this.General_Tab.TabIndex = 0;
- this.General_Tab.Text = "General";
- this.General_Tab.UseVisualStyleBackColor = true;
- //
- // label4
- //
- this.label4.Location = new System.Drawing.Point(20, 103);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(188, 23);
- this.label4.TabIndex = 22;
- this.label4.Text = "Apple Trailers Max Quality";
- //
- // cmbTrailerSize
- //
- this.cmbTrailerSize.FormattingEnabled = true;
- this.cmbTrailerSize.Location = new System.Drawing.Point(293, 100);
- this.cmbTrailerSize.Name = "cmbTrailerSize";
- this.cmbTrailerSize.Size = new System.Drawing.Size(121, 24);
- this.cmbTrailerSize.TabIndex = 21;
- //
- // txtDownloadDir
- //
- this.txtDownloadDir.Location = new System.Drawing.Point(293, 70);
- this.txtDownloadDir.Margin = new System.Windows.Forms.Padding(4);
- this.txtDownloadDir.Name = "txtDownloadDir";
- this.txtDownloadDir.Size = new System.Drawing.Size(227, 22);
- this.txtDownloadDir.TabIndex = 20;
- //
- // label3
- //
- this.label3.Location = new System.Drawing.Point(20, 74);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(143, 28);
- this.label3.TabIndex = 19;
- this.label3.Text = "Download Folder:";
- //
- // groupBox2
- //
- this.groupBox2.Controls.Add(this.btnAdd);
- this.groupBox2.Controls.Add(this.CategoryList);
- this.groupBox2.Controls.Add(this.btnDeleteRss);
- this.groupBox2.Controls.Add(this.txtRssUrl);
- this.groupBox2.Controls.Add(this.btnRssSave);
- this.groupBox2.Controls.Add(this.label26);
- this.groupBox2.Controls.Add(this.txtRssName);
- this.groupBox2.Controls.Add(this.label25);
- this.groupBox2.Location = new System.Drawing.Point(20, 391);
- this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox2.Size = new System.Drawing.Size(548, 281);
- this.groupBox2.TabIndex = 18;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Site Categories";
- //
- // btnAdd
- //
- this.btnAdd.Location = new System.Drawing.Point(116, 248);
- this.btnAdd.Margin = new System.Windows.Forms.Padding(4);
- this.btnAdd.Name = "btnAdd";
- this.btnAdd.Size = new System.Drawing.Size(100, 28);
- this.btnAdd.TabIndex = 17;
- this.btnAdd.Text = "Add";
- this.btnAdd.UseVisualStyleBackColor = true;
- this.btnAdd.Click += new System.EventHandler(this.BtnAddClick);
- //
- // CategoryList
- //
- this.CategoryList.FormattingEnabled = true;
- this.CategoryList.ItemHeight = 16;
- this.CategoryList.Location = new System.Drawing.Point(8, 23);
- this.CategoryList.Margin = new System.Windows.Forms.Padding(4);
- this.CategoryList.Name = "CategoryList";
- this.CategoryList.Size = new System.Drawing.Size(159, 212);
- this.CategoryList.TabIndex = 6;
- this.CategoryList.SelectedIndexChanged += new System.EventHandler(this.CategoryListSelectedIndexChanged);
- //
- // btnDeleteRss
- //
- this.btnDeleteRss.Location = new System.Drawing.Point(8, 248);
- this.btnDeleteRss.Margin = new System.Windows.Forms.Padding(4);
- this.btnDeleteRss.Name = "btnDeleteRss";
- this.btnDeleteRss.Size = new System.Drawing.Size(100, 28);
- this.btnDeleteRss.TabIndex = 14;
- this.btnDeleteRss.Text = "Delete";
- this.btnDeleteRss.UseVisualStyleBackColor = true;
- this.btnDeleteRss.Click += new System.EventHandler(this.BtnDeleteRssClick);
- //
- // txtRssUrl
- //
- this.txtRssUrl.Location = new System.Drawing.Point(300, 85);
- this.txtRssUrl.Margin = new System.Windows.Forms.Padding(4);
- this.txtRssUrl.Name = "txtRssUrl";
- this.txtRssUrl.Size = new System.Drawing.Size(239, 22);
- this.txtRssUrl.TabIndex = 16;
- //
- // btnRssSave
- //
- this.btnRssSave.Location = new System.Drawing.Point(300, 117);
- this.btnRssSave.Margin = new System.Windows.Forms.Padding(4);
- this.btnRssSave.Name = "btnRssSave";
- this.btnRssSave.Size = new System.Drawing.Size(100, 28);
- this.btnRssSave.TabIndex = 13;
- this.btnRssSave.Text = "Save";
- this.btnRssSave.UseVisualStyleBackColor = true;
- this.btnRssSave.Click += new System.EventHandler(this.BtnRssSaveClick);
- //
- // label26
- //
- this.label26.Location = new System.Drawing.Point(197, 53);
- this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(95, 28);
- this.label26.TabIndex = 9;
- this.label26.Text = "RSS Name";
- //
- // txtRssName
- //
- this.txtRssName.Location = new System.Drawing.Point(300, 53);
- this.txtRssName.Margin = new System.Windows.Forms.Padding(4);
- this.txtRssName.Name = "txtRssName";
- this.txtRssName.Size = new System.Drawing.Size(239, 22);
- this.txtRssName.TabIndex = 15;
- //
- // label25
- //
- this.label25.Location = new System.Drawing.Point(197, 85);
- this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(95, 21);
- this.label25.TabIndex = 10;
- this.label25.Text = "RSS URL";
- //
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.txtPassword);
- this.groupBox1.Controls.Add(this.txtUserId);
- this.groupBox1.Controls.Add(this.chkAgeConfirm);
- this.groupBox1.Controls.Add(this.label30);
- this.groupBox1.Controls.Add(this.label29);
- this.groupBox1.Controls.Add(this.btnSiteSave);
- this.groupBox1.Controls.Add(this.TxtSiteId);
- this.groupBox1.Controls.Add(this.txtSiteName);
- this.groupBox1.Controls.Add(this.label28);
- this.groupBox1.Controls.Add(this.label27);
- this.groupBox1.Controls.Add(this.siteList);
- this.groupBox1.Controls.Add(this.chkEnabled);
- this.groupBox1.Location = new System.Drawing.Point(20, 129);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox1.Size = new System.Drawing.Size(548, 250);
- this.groupBox1.TabIndex = 17;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Sites";
- //
- // txtPassword
- //
- this.txtPassword.Location = new System.Drawing.Point(300, 148);
- this.txtPassword.Margin = new System.Windows.Forms.Padding(4);
- this.txtPassword.Name = "txtPassword";
- this.txtPassword.Size = new System.Drawing.Size(239, 22);
- this.txtPassword.TabIndex = 18;
- //
- // txtUserId
- //
- this.txtUserId.Location = new System.Drawing.Point(300, 117);
- this.txtUserId.Margin = new System.Windows.Forms.Padding(4);
- this.txtUserId.Name = "txtUserId";
- this.txtUserId.Size = new System.Drawing.Size(239, 22);
- this.txtUserId.TabIndex = 17;
- //
- // chkAgeConfirm
- //
- this.chkAgeConfirm.Location = new System.Drawing.Point(176, 180);
- this.chkAgeConfirm.Margin = new System.Windows.Forms.Padding(4);
- this.chkAgeConfirm.Name = "chkAgeConfirm";
- this.chkAgeConfirm.Size = new System.Drawing.Size(139, 30);
- this.chkAgeConfirm.TabIndex = 16;
- this.chkAgeConfirm.Text = "Confirm Age";
- this.chkAgeConfirm.UseVisualStyleBackColor = true;
- //
- // label30
- //
- this.label30.Location = new System.Drawing.Point(176, 151);
- this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(133, 28);
- this.label30.TabIndex = 15;
- this.label30.Text = "Password";
- //
- // label29
- //
- this.label29.Location = new System.Drawing.Point(176, 119);
- this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(133, 28);
- this.label29.TabIndex = 14;
- this.label29.Text = "UserId";
- //
- // btnSiteSave
- //
- this.btnSiteSave.Location = new System.Drawing.Point(176, 217);
- this.btnSiteSave.Margin = new System.Windows.Forms.Padding(4);
- this.btnSiteSave.Name = "btnSiteSave";
- this.btnSiteSave.Size = new System.Drawing.Size(100, 28);
- this.btnSiteSave.TabIndex = 13;
- this.btnSiteSave.Text = "Save";
- this.btnSiteSave.UseVisualStyleBackColor = true;
- this.btnSiteSave.Click += new System.EventHandler(this.BtnSiteSaveClick);
- //
- // TxtSiteId
- //
- this.TxtSiteId.Location = new System.Drawing.Point(300, 84);
- this.TxtSiteId.Margin = new System.Windows.Forms.Padding(4);
- this.TxtSiteId.Name = "TxtSiteId";
- this.TxtSiteId.ReadOnly = true;
- this.TxtSiteId.Size = new System.Drawing.Size(239, 22);
- this.TxtSiteId.TabIndex = 12;
- //
- // txtSiteName
- //
- this.txtSiteName.Location = new System.Drawing.Point(300, 53);
- this.txtSiteName.Margin = new System.Windows.Forms.Padding(4);
- this.txtSiteName.Name = "txtSiteName";
- this.txtSiteName.Size = new System.Drawing.Size(239, 22);
- this.txtSiteName.TabIndex = 11;
- //
- // label28
- //
- this.label28.Location = new System.Drawing.Point(176, 85);
- this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(133, 28);
- this.label28.TabIndex = 10;
- this.label28.Text = "Site ID:";
- //
- // label27
- //
- this.label27.Location = new System.Drawing.Point(176, 57);
- this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(133, 28);
- this.label27.TabIndex = 9;
- this.label27.Text = "Site Name:";
- //
- // siteList
- //
- this.siteList.FormattingEnabled = true;
- this.siteList.ItemHeight = 16;
- this.siteList.Location = new System.Drawing.Point(8, 23);
- this.siteList.Margin = new System.Windows.Forms.Padding(4);
- this.siteList.Name = "siteList";
- this.siteList.Size = new System.Drawing.Size(159, 196);
- this.siteList.TabIndex = 5;
- this.siteList.SelectedIndexChanged += new System.EventHandler(this.SiteListSelectedIndexChanged);
- //
- // chkEnabled
- //
- this.chkEnabled.Location = new System.Drawing.Point(176, 23);
- this.chkEnabled.Margin = new System.Windows.Forms.Padding(4);
- this.chkEnabled.Name = "chkEnabled";
- this.chkEnabled.Size = new System.Drawing.Size(139, 30);
- this.chkEnabled.TabIndex = 8;
- this.chkEnabled.Text = "Enabled";
- this.chkEnabled.UseVisualStyleBackColor = true;
- //
- // txtFilters
- //
- this.txtFilters.Location = new System.Drawing.Point(293, 43);
- this.txtFilters.Margin = new System.Windows.Forms.Padding(4);
- this.txtFilters.Name = "txtFilters";
- this.txtFilters.Size = new System.Drawing.Size(227, 22);
- this.txtFilters.TabIndex = 4;
- //
- // label2
- //
- this.label2.Location = new System.Drawing.Point(20, 47);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(265, 28);
- this.label2.TabIndex = 3;
- this.label2.Text = "Filter out videos with these tags";
- //
- // txtThumbLoc
- //
- this.txtThumbLoc.Location = new System.Drawing.Point(293, 11);
- this.txtThumbLoc.Margin = new System.Windows.Forms.Padding(4);
- this.txtThumbLoc.Name = "txtThumbLoc";
- this.txtThumbLoc.Size = new System.Drawing.Size(227, 22);
- this.txtThumbLoc.TabIndex = 2;
- //
- // label1
- //
- this.label1.Location = new System.Drawing.Point(20, 15);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(143, 28);
- this.label1.TabIndex = 1;
- this.label1.Text = "Thumbnail Location:";
- //
- // Configuration
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(681, 744);
- this.Controls.Add(this.tabControl1);
- this.Margin = new System.Windows.Forms.Padding(4);
- this.Name = "Configuration";
- this.Text = "Configuration";
- this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ConfigurationFormClosing);
- this.Load += new System.EventHandler(this.Configuration_Load);
- this.tabControl1.ResumeLayout(false);
- this.General_Tab.ResumeLayout(false);
- this.General_Tab.PerformLayout();
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- this.ResumeLayout(false);
+ this.label4 = new System.Windows.Forms.Label();
+ this.cmbTrailerSize = new System.Windows.Forms.ComboBox();
+ this.txtDownloadDir = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.btnAdd = new System.Windows.Forms.Button();
+ this.CategoryList = new System.Windows.Forms.ListBox();
+ this.btnDeleteRss = new System.Windows.Forms.Button();
+ this.txtRssUrl = new System.Windows.Forms.TextBox();
+ this.btnRssSave = new System.Windows.Forms.Button();
+ this.label26 = new System.Windows.Forms.Label();
+ this.txtRssName = new System.Windows.Forms.TextBox();
+ this.label25 = new System.Windows.Forms.Label();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.txtPassword = new System.Windows.Forms.TextBox();
+ this.txtUserId = new System.Windows.Forms.TextBox();
+ this.chkAgeConfirm = new System.Windows.Forms.CheckBox();
+ this.label30 = new System.Windows.Forms.Label();
+ this.label29 = new System.Windows.Forms.Label();
+ this.btnSiteSave = new System.Windows.Forms.Button();
+ this.TxtSiteId = new System.Windows.Forms.TextBox();
+ this.txtSiteName = new System.Windows.Forms.TextBox();
+ this.label28 = new System.Windows.Forms.Label();
+ this.label27 = new System.Windows.Forms.Label();
+ this.siteList = new System.Windows.Forms.ListBox();
+ this.chkEnabled = new System.Windows.Forms.CheckBox();
+ this.txtFilters = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.txtThumbLoc = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
+ this.label5 = new System.Windows.Forms.Label();
+ this.mplayerUse = new System.Windows.Forms.CheckBox();
+ this.button1 = new System.Windows.Forms.Button();
+ this.groupBox2.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // label4
+ //
+ this.label4.Location = new System.Drawing.Point(18, 88);
+ this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(141, 19);
+ this.label4.TabIndex = 22;
+ this.label4.Text = "Apple Trailers Max Quality";
+ //
+ // cmbTrailerSize
+ //
+ this.cmbTrailerSize.FormattingEnabled = true;
+ this.cmbTrailerSize.Location = new System.Drawing.Point(220, 86);
+ this.cmbTrailerSize.Margin = new System.Windows.Forms.Padding(2);
+ this.cmbTrailerSize.Name = "cmbTrailerSize";
+ this.cmbTrailerSize.Size = new System.Drawing.Size(92, 21);
+ this.cmbTrailerSize.TabIndex = 21;
+ //
+ // txtDownloadDir
+ //
+ this.txtDownloadDir.Location = new System.Drawing.Point(220, 61);
+ this.txtDownloadDir.Name = "txtDownloadDir";
+ this.txtDownloadDir.Size = new System.Drawing.Size(171, 20);
+ this.txtDownloadDir.TabIndex = 20;
+ //
+ // label3
+ //
+ this.label3.Location = new System.Drawing.Point(18, 64);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(107, 23);
+ this.label3.TabIndex = 19;
+ this.label3.Text = "Download Folder:";
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.btnAdd);
+ this.groupBox2.Controls.Add(this.CategoryList);
+ this.groupBox2.Controls.Add(this.btnDeleteRss);
+ this.groupBox2.Controls.Add(this.txtRssUrl);
+ this.groupBox2.Controls.Add(this.btnRssSave);
+ this.groupBox2.Controls.Add(this.label26);
+ this.groupBox2.Controls.Add(this.txtRssName);
+ this.groupBox2.Controls.Add(this.label25);
+ this.groupBox2.Location = new System.Drawing.Point(12, 374);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(411, 228);
+ this.groupBox2.TabIndex = 18;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Site Categories";
+ //
+ // btnAdd
+ //
+ this.btnAdd.Enabled = false;
+ this.btnAdd.Location = new System.Drawing.Point(135, 202);
+ this.btnAdd.Name = "btnAdd";
+ this.btnAdd.Size = new System.Drawing.Size(112, 23);
+ this.btnAdd.TabIndex = 17;
+ this.btnAdd.Text = "Add Category";
+ this.btnAdd.UseVisualStyleBackColor = true;
+ this.btnAdd.Click += new System.EventHandler(this.BtnAddClick);
+ //
+ // CategoryList
+ //
+ this.CategoryList.FormattingEnabled = true;
+ this.CategoryList.Location = new System.Drawing.Point(6, 23);
+ this.CategoryList.Name = "CategoryList";
+ this.CategoryList.Size = new System.Drawing.Size(120, 173);
+ this.CategoryList.TabIndex = 6;
+ this.CategoryList.SelectedIndexChanged += new System.EventHandler(this.CategoryListSelectedIndexChanged);
+ //
+ // btnDeleteRss
+ //
+ this.btnDeleteRss.Enabled = false;
+ this.btnDeleteRss.Location = new System.Drawing.Point(6, 202);
+ this.btnDeleteRss.Name = "btnDeleteRss";
+ this.btnDeleteRss.Size = new System.Drawing.Size(112, 23);
+ this.btnDeleteRss.TabIndex = 14;
+ this.btnDeleteRss.Text = "Delete Category";
+ this.btnDeleteRss.UseVisualStyleBackColor = true;
+ this.btnDeleteRss.Click += new System.EventHandler(this.BtnDeleteRssClick);
+ //
+ // txtRssUrl
+ //
+ this.txtRssUrl.Enabled = false;
+ this.txtRssUrl.Location = new System.Drawing.Point(225, 69);
+ this.txtRssUrl.Name = "txtRssUrl";
+ this.txtRssUrl.Size = new System.Drawing.Size(180, 20);
+ this.txtRssUrl.TabIndex = 16;
+ //
+ // btnRssSave
+ //
+ this.btnRssSave.Enabled = false;
+ this.btnRssSave.Location = new System.Drawing.Point(225, 95);
+ this.btnRssSave.Name = "btnRssSave";
+ this.btnRssSave.Size = new System.Drawing.Size(95, 23);
+ this.btnRssSave.TabIndex = 13;
+ this.btnRssSave.Text = "Save Category";
+ this.btnRssSave.UseVisualStyleBackColor = true;
+ this.btnRssSave.Click += new System.EventHandler(this.BtnRssSaveClick);
+ //
+ // label26
+ //
+ this.label26.Location = new System.Drawing.Point(148, 43);
+ this.label26.Name = "label26";
+ this.label26.Size = new System.Drawing.Size(71, 23);
+ this.label26.TabIndex = 9;
+ this.label26.Text = "RSS Name";
+ //
+ // txtRssName
+ //
+ this.txtRssName.Enabled = false;
+ this.txtRssName.Location = new System.Drawing.Point(225, 43);
+ this.txtRssName.Name = "txtRssName";
+ this.txtRssName.Size = new System.Drawing.Size(180, 20);
+ this.txtRssName.TabIndex = 15;
+ //
+ // label25
+ //
+ this.label25.Location = new System.Drawing.Point(148, 69);
+ this.label25.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(71, 17);
+ this.label25.TabIndex = 10;
+ this.label25.Text = "RSS URL";
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.txtPassword);
+ this.groupBox1.Controls.Add(this.txtUserId);
+ this.groupBox1.Controls.Add(this.chkAgeConfirm);
+ this.groupBox1.Controls.Add(this.label30);
+ this.groupBox1.Controls.Add(this.label29);
+ this.groupBox1.Controls.Add(this.btnSiteSave);
+ this.groupBox1.Controls.Add(this.TxtSiteId);
+ this.groupBox1.Controls.Add(this.txtSiteName);
+ this.groupBox1.Controls.Add(this.label28);
+ this.groupBox1.Controls.Add(this.label27);
+ this.groupBox1.Controls.Add(this.siteList);
+ this.groupBox1.Controls.Add(this.chkEnabled);
+ this.groupBox1.Location = new System.Drawing.Point(12, 165);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(411, 203);
+ this.groupBox1.TabIndex = 17;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Sites";
+ //
+ // txtPassword
+ //
+ this.txtPassword.Enabled = false;
+ this.txtPassword.Location = new System.Drawing.Point(225, 120);
+ this.txtPassword.Name = "txtPassword";
+ this.txtPassword.Size = new System.Drawing.Size(180, 20);
+ this.txtPassword.TabIndex = 18;
+ //
+ // txtUserId
+ //
+ this.txtUserId.Enabled = false;
+ this.txtUserId.Location = new System.Drawing.Point(225, 95);
+ this.txtUserId.Name = "txtUserId";
+ this.txtUserId.Size = new System.Drawing.Size(180, 20);
+ this.txtUserId.TabIndex = 17;
+ //
+ // chkAgeConfirm
+ //
+ this.chkAgeConfirm.Enabled = false;
+ this.chkAgeConfirm.Location = new System.Drawing.Point(132, 146);
+ this.chkAgeConfirm.Name = "chkAgeConfirm";
+ this.chkAgeConfirm.Size = new System.Drawing.Size(104, 24);
+ this.chkAgeConfirm.TabIndex = 16;
+ this.chkAgeConfirm.Text = "Confirm Age";
+ this.chkAgeConfirm.UseVisualStyleBackColor = true;
+ //
+ // label30
+ //
+ this.label30.Location = new System.Drawing.Point(132, 123);
+ this.label30.Name = "label30";
+ this.label30.Size = new System.Drawing.Size(100, 23);
+ this.label30.TabIndex = 15;
+ this.label30.Text = "Password";
+ //
+ // label29
+ //
+ this.label29.Location = new System.Drawing.Point(132, 97);
+ this.label29.Name = "label29";
+ this.label29.Size = new System.Drawing.Size(100, 23);
+ this.label29.TabIndex = 14;
+ this.label29.Text = "UserId";
+ //
+ // btnSiteSave
+ //
+ this.btnSiteSave.Enabled = false;
+ this.btnSiteSave.Location = new System.Drawing.Point(132, 176);
+ this.btnSiteSave.Name = "btnSiteSave";
+ this.btnSiteSave.Size = new System.Drawing.Size(75, 23);
+ this.btnSiteSave.TabIndex = 13;
+ this.btnSiteSave.Text = "Save Site";
+ this.btnSiteSave.UseVisualStyleBackColor = true;
+ this.btnSiteSave.Click += new System.EventHandler(this.BtnSiteSaveClick);
+ //
+ // TxtSiteId
+ //
+ this.TxtSiteId.Location = new System.Drawing.Point(225, 68);
+ this.TxtSiteId.Name = "TxtSiteId";
+ this.TxtSiteId.ReadOnly = true;
+ this.TxtSiteId.Size = new System.Drawing.Size(180, 20);
+ this.TxtSiteId.TabIndex = 12;
+ //
+ // txtSiteName
+ //
+ this.txtSiteName.Enabled = false;
+ this.txtSiteName.Location = new System.Drawing.Point(225, 43);
+ this.txtSiteName.Name = "txtSiteName";
+ this.txtSiteName.Size = new System.Drawing.Size(180, 20);
+ this.txtSiteName.TabIndex = 11;
+ //
+ // label28
+ //
+ this.label28.Location = new System.Drawing.Point(132, 69);
+ this.label28.Name = "label28";
+ this.label28.Size = new System.Drawing.Size(100, 23);
+ this.label28.TabIndex = 10;
+ this.label28.Text = "Site ID:";
+ //
+ // label27
+ //
+ this.label27.Location = new System.Drawing.Point(132, 46);
+ this.label27.Name = "label27";
+ this.label27.Size = new System.Drawing.Size(100, 23);
+ this.label27.TabIndex = 9;
+ this.label27.Text = "Site Name:";
+ //
+ // siteList
+ //
+ this.siteList.FormattingEnabled = true;
+ this.siteList.Location = new System.Drawing.Point(6, 19);
+ this.siteList.Name = "siteList";
+ this.siteList.Size = new System.Drawing.Size(120, 160);
+ this.siteList.TabIndex = 5;
+ this.siteList.SelectedIndexChanged += new System.EventHandler(this.SiteListSelectedIndexChanged);
+ //
+ // chkEnabled
+ //
+ this.chkEnabled.Enabled = false;
+ this.chkEnabled.Location = new System.Drawing.Point(132, 19);
+ this.chkEnabled.Name = "chkEnabled";
+ this.chkEnabled.Size = new System.Drawing.Size(104, 24);
+ this.chkEnabled.TabIndex = 8;
+ this.chkEnabled.Text = "Enabled";
+ this.chkEnabled.UseVisualStyleBackColor = true;
+ //
+ // txtFilters
+ //
+ this.txtFilters.Location = new System.Drawing.Point(220, 35);
+ this.txtFilters.Name = "txtFilters";
+ this.txtFilters.Size = new System.Drawing.Size(171, 20);
+ this.txtFilters.TabIndex = 4;
+ //
+ // label2
+ //
+ this.label2.Location = new System.Drawing.Point(18, 41);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(199, 23);
+ this.label2.TabIndex = 3;
+ this.label2.Text = "Filter out videos with these tags";
+ //
+ // txtThumbLoc
+ //
+ this.txtThumbLoc.Location = new System.Drawing.Point(220, 9);
+ this.txtThumbLoc.Name = "txtThumbLoc";
+ this.txtThumbLoc.Size = new System.Drawing.Size(171, 20);
+ this.txtThumbLoc.TabIndex = 2;
+ //
+ // label1
+ //
+ this.label1.Location = new System.Drawing.Point(18, 12);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(107, 23);
+ this.label1.TabIndex = 1;
+ this.label1.Text = "Thumbnail Location:";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(18, 114);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(129, 13);
+ this.label5.TabIndex = 23;
+ this.label5.Text = "Use Mplayer for all Videos";
+ //
+ // mplayerUse
+ //
+ this.mplayerUse.AutoSize = true;
+ this.mplayerUse.Location = new System.Drawing.Point(220, 113);
+ this.mplayerUse.Name = "mplayerUse";
+ this.mplayerUse.Size = new System.Drawing.Size(15, 14);
+ this.mplayerUse.TabIndex = 24;
+ this.mplayerUse.UseVisualStyleBackColor = true;
+ //
+ // button1
+ //
+ this.button1.Location = new System.Drawing.Point(348, 136);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(75, 23);
+ this.button1.TabIndex = 25;
+ this.button1.Text = "Finish";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
+ //
+ // Configuration
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(511, 604);
+ this.Controls.Add(this.button1);
+ this.Controls.Add(this.mplayerUse);
+ this.Controls.Add(this.label5);
+ this.Controls.Add(this.label4);
+ this.Controls.Add(this.cmbTrailerSize);
+ this.Controls.Add(this.txtDownloadDir);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.txtFilters);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.txtThumbLoc);
+ this.Controls.Add(this.label1);
+ this.Name = "Configuration";
+ this.Text = "Configuration";
+ this.Load += new System.EventHandler(this.Configuration_Load);
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ConfigurationFormClosing);
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
}
private System.Windows.Forms.ComboBox cmbTrailerSize;
private System.Windows.Forms.Label label4;
@@ -456,12 +443,16 @@
private System.Windows.Forms.TextBox txtThumbLoc;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TabPage General_Tab;
- private System.Windows.Forms.TabControl tabControl1;
+ //private System.Windows.Forms.TabPage General_Tab;
+ //private System.Windows.Forms.TabControl tabControl1;
void CheckBox1CheckedChanged(object sender, System.EventArgs e)
{
}
+
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.CheckBox mplayerUse;
+ private System.Windows.Forms.Button button1;
}
}
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/Configuration.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/Configuration.cs 2008-01-28 22:25:52 UTC (rev 1320)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/Configuration.cs 2008-01-28 22:27:53 UTC (rev 1321)
@@ -26,8 +26,10 @@
{
//private String msSelectedSiteID;
private String msSelectedCategoryName;
+ private int miSelectedCategoryIndex = -1;
+
private List<GUIOnlineVideos.SiteSettings> moSiteList = new List<GUIOnlineVideos.SiteSettings>();
-
+
public Configuration()
{
//
@@ -44,12 +46,13 @@
txtThumbLoc.Text = settings.msThumbLocation;
String lsFilterList = "";
String [] lsFilterArray = settings.msFilterArray;
+
if(lsFilterArray!=null){
foreach (String lsFilter in lsFilterArray){
lsFilterList+=lsFilter+",";
}
txtFilters.Text = lsFilterList;
- }
+ }
foreach(GUIOnlineVideos.SiteSettings site in settings.moSiteList.Values){
siteList.Items.Add(site.name);
moSiteList.Add(site);
@@ -61,7 +64,7 @@
cmbTrailerSize.SelectedIndex = cmbTrailerSize.Items.Count-1;
}
}
-
+ this.mplayerUse.Checked = settings.mbForceMPlayer;
}
void SiteListSelectedIndexChanged(object sender, EventArgs e)
@@ -75,6 +78,28 @@
txtPassword.Text = site.password;
chkEnabled.Checked = site.enabled;
chkAgeConfirm.Checked = site.confirmAge;
+ SiteUtilBase siteUtil= SiteUtilFactory.getSiteUtil(site.id);
+ if (siteUtil.hasConfirmAge())
+ {
+ chkAgeConfirm.Enabled = true;
+ }
+ else
+ {
+ chkAgeConfirm.Enabled = false;
+ }
+ if(siteUtil.hasLoginSupport()){
+ txtUserId.Enabled = true;
+ txtPassword.Enabled = true;
+ }else{
+ txtUserId.Enabled = false;
+ txtPassword.Enabled = false;
+ }
+ txtSiteName.Enabled = true;
+ btnSiteSave.Enabled = true;
+ btnDeleteRss.Enabled = true;
+ btnRssSave.Enabled = true;
+ btnAdd.Enabled = true;
+
CategoryList.Items.Clear();
foreach(String name in site.RssList.Keys){
CategoryList.Items.Add(name);
@@ -84,22 +109,37 @@
CategoryList.SelectedIndex = -1;
txtRssUrl.Text = "";
txtRssName.Text = "";
+ txtRssUrl.Enabled = false;
+ txtRssName.Enabled = false;
+ btnRssSave.Enabled = false;
}
void CategoryListSelectedIndexChanged(object sender, EventArgs e)
{
- if(CategoryList.SelectedIndex>-1){
- OnlineVideoSettings settings = OnlineVideoSettings.getInstance();
- GUIOnlineVideos.SiteSettings site = moSiteList[siteList.SelectedIndex];
- msSelectedCategoryName = CategoryList.SelectedItem.ToString();
- Log.Info("Category change site:{0} with selected category of {1}",site.name,msSelectedCategoryName);
-
- GUIOnlineVideos.RssLink link = site.RssList[msSelectedCategoryName];
- txtRssUrl.Text = link.url;
- txtRssName.Text = link.name;
- }
-
-
+ if (CategoryList.SelectedIndex !=miSelectedCategoryIndex && CategoryList.SelectedIndex > -1)
+ {
+
+ OnlineVideoSettings settings = OnlineVideoSettings.getInstance();
+ GUIOnlineVideos.SiteSettings site = moSiteList[siteList.SelectedIndex];
+ msSelectedCategoryName = CategoryList.SelectedItem.ToString();
+ miSelectedCategoryIndex = CategoryList.SelectedIndex;
+ Log.Info("Category change site:{0} with selected category of {1}", site.name, msSelectedCategoryName);
+ GUIOnlineVideos.RssLink link = null;
+ link = site.RssList[msSelectedCategoryName];
+ txtRssUrl.Text = link.url;
+ txtRssName.Text = link.name;
+ txtRssUrl.Enabled = true;
+ txtRssName.Enabled = true;
+ btnRssSave.Enabled = true;
+
+ }
+ if (CategoryList.SelectedIndex == -1)
+ {
+ txtRssUrl.Enabled = false;
+ txtRssName.Enabled = false;
+ btnRssSave.Enabled = false;
+
+ }
}
void BtnSiteSaveClick(object sender, EventArgs e)
@@ -129,20 +169,26 @@
void BtnRssSaveClick(object sender, EventArgs e)
{
- OnlineVideoSettings settings = OnlineVideoSettings.getInstance();
- GUIOnlineVideos.SiteSettings site = moSiteList[siteList.SelectedIndex];
- GUIOnlineVideos.RssLink link = site.RssList[msSelectedCategoryName];
- link.name = txtRssName.Text;
- link.url = txtRssUrl.Text;
- CategoryList.Items[CategoryList.SelectedIndex] = txtRssName.Text;
- //site.RssList.Remove(msSelectedCategoryName);
- //msSelectedCategoryName = txtRssName.Text;
- //site.RssList.Add(msSelectedCategoryName,link);
- CategoryList.SelectedIndex = -1;
+ if (CategoryList.SelectedIndex > -1)
+ {
+ OnlineVideoSettings settings = OnlineVideoSettings.getInstance();
+ GUIOnlineVideos.SiteSettings site = moSiteList[siteList.SelectedIndex];
+ GUIOnlineVideos.RssLink link = null;
+ link = site.RssList[msSelectedCategoryName];
+ site.RssList.Remove(msSelectedCategoryName);
+ link.name = txtRssName.Text;
+ link.url = txtRssUrl.Text;
+ CategoryList.Items[CategoryList.SelectedIndex] = txtRssName.Text;
+ site.RssList.Add(link.name, link);
+ //site.RssList.Remove(msSelectedCategoryName);
+ //msSelectedCategoryName = txtRssName.Text;
+ //site.RssList.Add(msSelectedCategoryName,link);
+ CategoryList.SelectedIndex = -1;
+ }
}
void BtnAddClick(object sender, EventArgs e)
- {
+ {
GUIOnlineVideos.RssLink link = new GUIOnlineVideos.RssLink();
link.name = "new";
link.url = "http://";
@@ -152,6 +198,7 @@
CategoryList.Items.Add(link.name);
CategoryList.SelectedIndex = CategoryList.Items.Count-1;
txtRssName.Focus();
+ msSelectedCategoryName = "new";
}
@@ -165,6 +212,7 @@
CategoryList.Items.RemoveAt(CategoryList.SelectedIndex);
txtRssName.Text = "";
txtRssUrl.Text = "";
+ miSelectedCategoryIndex = -1;
}
}
@@ -178,6 +226,8 @@
settings.msThumbLocation = txtThumbLoc.Text;
settings.msDownloadDir = txtDownloadDir.Text;
settings.AppleTrailerSize = (ITMSClient.TrailerSize) cmbTrailerSize.SelectedItem;
+ settings.mbForceMPlayer = mplayerUse.Checked;
+ Log.Write("force mplayer={0}",settings.mbForceMPlayer);
settings.moSiteList.Clear();
foreach(GUIOnlineVideos.SiteSettings site in moSiteList){
settings.moSiteList.Add(site.id,site);
@@ -186,5 +236,10 @@
}
+
+ private void button1_Click(object sender, EventArgs e)
+ {
+ Close();
+ }
}
}
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs 2008-01-28 22:25:52 UTC (rev 1320)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs 2008-01-28 22:27:53 UTC (rev 1321)
@@ -15,6 +15,7 @@
using MediaPortal.Utils;
using MediaPortal.Configuration;
using MediaPortal.Player;
+using MediaPortal.Playlists;
using MediaPortal.GUI;
namespace OnlineVideos
@@ -74,6 +75,10 @@
public bool confirmAge;
public bool enabled;
public Dictionary<String, RssLink> RssList = new Dictionary<String, RssLink>();
+ public String toString()
+ {
+ return "name";
+ }
}
public class RssLink
{
@@ -98,6 +103,10 @@
//Length = -1;
VideoID = -1;
}
+ public override string ToString()
+ {
+ return String.Format("Title:{0}\nDesc:{1}\nVidUrl:{2}\nImgUrl:{3}\nLength:{4}\nTags:{5}",Title,Description,VideoUrl,ImageUrl,Length,Tags);
+ }
}
public class FavoriteVideoInfo:VideoInfo
{
@@ -308,7 +317,7 @@
//foreach(VideoInfo video in moCurrentVideoList){
//Log.Info(video.Title);
//}
- moCurrentVideoList = site.getRelatedVideos(moCurrentVideoList[liSelected].Tags);
+ moCurrentVideoList = site.getRelatedVideos(moCurrentVideoList[liSelected].VideoUrl);
//Log.Info("VideoList after:");
//foreach(VideoInfo video in moCurrentVideoList){
// Log.Info(video.Title);
@@ -846,14 +855,57 @@
private void Play(VideoInfo foListItem)
{
//foListItem.
- SiteSettings loSite = moSiteList[msSelectedSiteId];
- String lsUrl = SiteUtilFactory.getSiteUtil(msSelectedSiteId).getUrl(foListItem,loSite);
+ SiteSettings loSiteSettings = moSiteList[msSelectedSiteId];
+ SiteUtilBase loSite = SiteUtilFactory.getSiteUtil(msSelectedSiteId);
+
if (mbPlayFullscreen)
{
- g_Player.Play(lsUrl);
- GUIGraphicsContext.IsFullScreenVideo = true;
- GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO);
+ bool playing = false;
+ OnlineVideoSettings settings = OnlineVideoSettings.getInstance();
+ if(loSite.MultipleFilePlay()){
+ PlayList videoList = PlayListPlayer.SingletonPlayer.GetPlaylist(PlayListType.PLAYLIST_VIDEO_TEMP);
+ PlayListItem item;
+
+ List<String> loUrlList = loSite.getMultipleVideoUrls(foListItem,loSiteSettings);
+ foreach(String url in loUrlList){
+ if (settings.mbForceMPlayer)
+ {
+
+
+ item = new PlayListItem("", url + OnlineVideoSettings.MPLAYER_EXT);
+ }
+ else
+ {
+ item = new PlayListItem("", url);
+ }
+ //item.Type = PlayListType.PLAYLIST_VIDEO_TEMP;
+ videoList.Add(item);
+
+ }
+ PlayListPlayer.SingletonPlayer.CurrentPlaylistType = PlayListType.PLAYLIST_VIDEO_TEMP;
+ if(PlayListPlayer.SingletonPlayer.Play(0)){
+ playing = true;
+ }
+ }else{
+ String lsUrl = loSite.getUrl(foListItem, loSiteSettings);
+ if (settings.mbForceMPlayer)
+ {
+ lsUrl = lsUrl + OnlineVideoSettings.MPLAYER_EXT;
+ }
+ if(lsUrl.EndsWith(".wmv")){
+ if(g_Player.PlayAudioStream(lsUrl))
+ playing = true;
+ }else{
+ if(g_Player.Play(lsUrl))
+ playing =true;
+ }
+ }
+ if(playing){
+ GUIGraphicsContext.IsFullScreenVideo = true;
+ GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO);
+ }
}
+ /*
else
{
GUIWindowManager.ActivateWindow(4760);
@@ -870,6 +922,7 @@
GUIWindowManager.SendThreadMessage(msg);
}
+ */
}
private void SaveVideo(VideoInfo foListItem)
{
@@ -1164,8 +1217,14 @@
GUIPropertyManager.SetProperty("#length", "None");
}
else{
- TimeSpan t = TimeSpan.FromSeconds(Convert.ToDouble(foVideo.Length));
- GUIPropertyManager.SetProperty("#length", t.ToString());
+ double ldLength;
+ if(Double.TryParse(foVideo.Length,out ldLength)){
+ TimeSpan t = TimeSpan.FromSeconds(ldLength);
+ GUIPropertyManager.SetProperty("#length", t.ToString());
+ }
+ else{
+ GUIPropertyManager.SetProperty("#length", foVideo.Length);
+ }
}
if(String.IsNullOrEmpty(foVideo.Description)){
GUIPropertyManager.SetProperty("#desc", "None");
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/ImageDowloader.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/ImageDowloader.cs 2008-01-28 22:25:52 UTC (rev 1320)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/ImageDowloader.cs 2008-01-28 22:27:53 UTC (rev 1321)
@@ -205,7 +205,7 @@
if (System.IO.File.Exists(thumbnailLocation) == false)
{
//int iRotate = dbs.GetRotation(imageLocation);
- MediaPortal.Util.Picture.CreateThumbnail(imageLocation, thumbnailLocation, (int)Thumbs.ThumbResolution, (int)Thumbs.ThumbResolution, 0);
+ MediaPortal.Util.Picture.CreateThumbnail(imageLocation, thumbnailLocation, (int)Thumbs.ThumbResolution, (int)Thumbs.ThumbResolution, 0, Thumbs.SpeedThumbsSmall);
System.Threading.Thread.Sleep(25);
System.IO.File.Delete(imageLocation);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
