From: <moi...@us...> - 2007-01-30 02:13:07
|
Revision: 49 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=49&view=rev Author: moiristo Date: 2007-01-29 18:13:05 -0800 (Mon, 29 Jan 2007) Log Message: ----------- Version 0.5! Modified Paths: -------------- trunk/plugins/UitzendingGemist/UitGemist/NLGemist.cs trunk/plugins/UitzendingGemist/UitGemist/RTLGemist.cs trunk/plugins/UitzendingGemist/UitGemist/ShowWaitCursor.cs trunk/plugins/UitzendingGemist/UitGemist/UitGemist.csproj trunk/plugins/UitzendingGemist/UitGemist.suo trunk/plugins/UitzendingGemist/skin/[Default Skin]/RtlGemist.xml trunk/plugins/UitzendingGemist/skin/[Default Skin]/UitGemist.xml trunk/plugins/UitzendingGemist/skin/[Default Skin]/UitGemist2.xml trunk/plugins/UitzendingGemist/skin/[Default Skin]/UitGemistMain.xml trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/RtlGemist.xml trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist.xml trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist2.xml trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemistMain.xml Modified: trunk/plugins/UitzendingGemist/UitGemist/NLGemist.cs =================================================================== --- trunk/plugins/UitzendingGemist/UitGemist/NLGemist.cs 2007-01-29 23:35:51 UTC (rev 48) +++ trunk/plugins/UitzendingGemist/UitGemist/NLGemist.cs 2007-01-30 02:13:05 UTC (rev 49) @@ -275,11 +275,18 @@ } ShowList(Names); } + public static string GetPlayUrl(string url) { - Match m = Regex.Match(wc.GetUrl(url), @"var\smediaurl\s=\s.(http://.*?).;"); + string page = wc.GetUrl(url, true); + Log.Debug(""+page.Length); + Regex r = new Regex(@"src=.(?<url>.*?\.asf)", RegexOptions.Multiline); + Match m = r.Match(page); + Log.Debug(""+m.Success); url = m.Groups[1].Value; + Log.Debug("url length:" + url.Length); + Log.Debug(url); url = url.Replace(".rm", ".asf"); url = ConvertString(url); return url; Modified: trunk/plugins/UitzendingGemist/UitGemist/RTLGemist.cs =================================================================== --- trunk/plugins/UitzendingGemist/UitGemist/RTLGemist.cs 2007-01-29 23:35:51 UTC (rev 48) +++ trunk/plugins/UitzendingGemist/UitGemist/RTLGemist.cs 2007-01-30 02:13:05 UTC (rev 49) @@ -5,7 +5,7 @@ using System.Text.RegularExpressions; using MediaPortal.GUI.Library; using MediaPortal.Player; -using MediaPortal.Util; +using MediaPortal.Utils; using MediaPortal.Dialogs; using MediaPortal.Playlists; using System.Xml; Modified: trunk/plugins/UitzendingGemist/UitGemist/ShowWaitCursor.cs =================================================================== --- trunk/plugins/UitzendingGemist/UitGemist/ShowWaitCursor.cs 2007-01-29 23:35:51 UTC (rev 48) +++ trunk/plugins/UitzendingGemist/UitGemist/ShowWaitCursor.cs 2007-01-30 02:13:05 UTC (rev 49) @@ -136,6 +136,14 @@ secondRequest.UserAgent = agent; secondRequest.ContentType = postType; secondRequest.CookieContainer = new CookieContainer(); + + Cookie c = new Cookie(); + c.Domain = "player.omroep.nl"; + c.Name = "player_instellingen"; + c.Value = "formaat:wmv&kwaliteit:bb"; + + secondRequest.CookieContainer.Add(c); + CookieCollection cookies = firstResponse.Cookies; secondRequest.CookieContainer.Add(cookies); Modified: trunk/plugins/UitzendingGemist/UitGemist/UitGemist.csproj =================================================================== --- trunk/plugins/UitzendingGemist/UitGemist/UitGemist.csproj 2007-01-29 23:35:51 UTC (rev 48) +++ trunk/plugins/UitzendingGemist/UitGemist/UitGemist.csproj 2007-01-30 02:13:05 UTC (rev 49) @@ -9,6 +9,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>UitGemist</RootNamespace> <AssemblyName>UitGemist</AssemblyName> + <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -30,7 +31,7 @@ <ItemGroup> <Reference Include="Core, Version=1.0.2560.37327, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\trunk\mediaportal\Core\bin\Release\Core.dll</HintPath> + <HintPath>..\..\..\trunk\mediaportal\Core\bin\Release\Core.dll</HintPath> </Reference> <Reference Include="Dialogs, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> @@ -43,7 +44,7 @@ <Reference Include="System.Xml" /> <Reference Include="Utils, Version=1.0.2560.37325, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\trunk\mediaportal\Utils\bin\Release\Utils.dll</HintPath> + <HintPath>..\..\..\trunk\mediaportal\Utils\bin\Release\Utils.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -75,4 +76,7 @@ <Target Name="AfterBuild"> </Target> --> + <PropertyGroup> + <PostBuildEvent>xcopy $(TargetPath) D:\MediaPortal\trunk\mediaportal\xbmc\bin\Release\plugins\windows\$(TargetFileName) /y</PostBuildEvent> + </PropertyGroup> </Project> \ No newline at end of file Modified: trunk/plugins/UitzendingGemist/UitGemist.suo =================================================================== (Binary files differ) Modified: trunk/plugins/UitzendingGemist/skin/[Default Skin]/RtlGemist.xml =================================================================== --- trunk/plugins/UitzendingGemist/skin/[Default Skin]/RtlGemist.xml 2007-01-29 23:35:51 UTC (rev 48) +++ trunk/plugins/UitzendingGemist/skin/[Default Skin]/RtlGemist.xml 2007-01-30 02:13:05 UTC (rev 49) @@ -8,9 +8,12 @@ <control> <type>group</type> <description>group element</description> - <animation>FlyInFromLeft</animation> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + <animation effect="slide" time="250" start="-300,0">WindowOpen</animation> + <animation effect="slide" time="500" end="0,-300">WindowClose</animation> <layout>StackLayout</layout> - <posX>60</posX> + <posX>50</posX> <posY>97</posY> <control> <description>Favorieten</description> Modified: trunk/plugins/UitzendingGemist/skin/[Default Skin]/UitGemist.xml =================================================================== --- trunk/plugins/UitzendingGemist/skin/[Default Skin]/UitGemist.xml 2007-01-29 23:35:51 UTC (rev 48) +++ trunk/plugins/UitzendingGemist/skin/[Default Skin]/UitGemist.xml 2007-01-30 02:13:05 UTC (rev 49) @@ -8,9 +8,12 @@ <control> <type>group</type> <description>group element</description> - <animation>FlyInFromLeft</animation> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + <animation effect="slide" time="250" start="-300,0">WindowOpen</animation> + <animation effect="slide" time="500" end="0,-300">WindowClose</animation> <layout>StackLayout</layout> - <posX>60</posX> + <posX>50</posX> <posY>97</posY> <control> <description>Favorieten</description> Modified: trunk/plugins/UitzendingGemist/skin/[Default Skin]/UitGemist2.xml =================================================================== --- trunk/plugins/UitzendingGemist/skin/[Default Skin]/UitGemist2.xml 2007-01-29 23:35:51 UTC (rev 48) +++ trunk/plugins/UitzendingGemist/skin/[Default Skin]/UitGemist2.xml 2007-01-30 02:13:05 UTC (rev 49) @@ -8,12 +8,13 @@ <control> <type>group</type> <description>group element</description> - <animation>FlyInFromTop</animation> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> <control> <type>image</type> <description>Program image</description> <id>3</id> - <posX>60</posX> + <posX>50</posX> <posY>115</posY> <width>100</width> <height>75</height> Modified: trunk/plugins/UitzendingGemist/skin/[Default Skin]/UitGemistMain.xml =================================================================== --- trunk/plugins/UitzendingGemist/skin/[Default Skin]/UitGemistMain.xml 2007-01-29 23:35:51 UTC (rev 48) +++ trunk/plugins/UitzendingGemist/skin/[Default Skin]/UitGemistMain.xml 2007-01-30 02:13:05 UTC (rev 49) @@ -8,23 +8,20 @@ <controls> <import>common.window.xml</import> - <control> - <type>group</type> - <description>group element</description> - <animation>FlyInFromTop</animation> - <layout>StackLayout</layout> - <posX>80</posX> - <posY>120</posY> <!-- topmost item needs an onup with a value of 17 for topbar to work --> <control> <description>UitzendingGemist.nl</description> <type>button</type> <id>2</id> - <width>560</width> - <height>80</height> + <width>575</width> + <height>90</height> + <posX>80</posX> + <posY>120</posY> <textureNoFocus>nlgemist.png</textureNoFocus> <textureFocus>hover_nlgemist.png</textureFocus> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> <onup>17</onup> </control> @@ -33,15 +30,16 @@ <description>RTL Gemist</description> <type>button</type> <id>3</id> - <width>560</width> - <height>80</height> - <textXOff>10</textXOff> - <textYOff>5</textYOff> + <posX>80</posX> + <posY>220</posY> + <width>575</width> + <height>90</height> <textureNoFocus>rtlgemist.png</textureNoFocus> <textureFocus>hover_rtlgemist.png</textureFocus> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> <ondown>2</ondown> </control> - </control> </controls> </window> Modified: trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/RtlGemist.xml =================================================================== --- trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/RtlGemist.xml 2007-01-29 23:35:51 UTC (rev 48) +++ trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/RtlGemist.xml 2007-01-30 02:13:05 UTC (rev 49) @@ -18,7 +18,10 @@ <control> <type>group</type> <description>group element</description> - <animation>FlyInFromLeft</animation> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + <animation effect="slide" time="250" start="-300,0">WindowOpen</animation> + <animation effect="slide" time="500" end="0,-300">WindowClose</animation> <layout>StackLayout</layout> <posX>5</posX> <posY>125</posY> Modified: trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist.xml =================================================================== --- trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist.xml 2007-01-29 23:35:51 UTC (rev 48) +++ trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist.xml 2007-01-30 02:13:05 UTC (rev 49) @@ -18,7 +18,10 @@ <control> <type>group</type> <description>group element</description> - <animation>FlyInFromLeft</animation> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + <animation effect="slide" time="250" start="-300,0">WindowOpen</animation> + <animation effect="slide" time="500" end="0,-300">WindowClose</animation> <layout>StackLayout</layout> <posX>5</posX> <posY>125</posY> Modified: trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist2.xml =================================================================== --- trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist2.xml 2007-01-29 23:35:51 UTC (rev 48) +++ trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemist2.xml 2007-01-30 02:13:05 UTC (rev 49) @@ -18,7 +18,8 @@ <control> <type>group</type> <description>group element</description> - <animation>FlyInFromTop</animation> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> <control> <type>image</type> <description>Program image</description> Modified: trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemistMain.xml =================================================================== --- trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemistMain.xml 2007-01-29 23:35:51 UTC (rev 48) +++ trunk/plugins/UitzendingGemist/skin/[Project Mayhem]/UitGemistMain.xml 2007-01-30 02:13:05 UTC (rev 49) @@ -19,7 +19,10 @@ <control> <type>group</type> <description>group element</description> - <animation>FlyInFromTop</animation> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + <animation effect="slide" time="250" start="-300,0">WindowOpen</animation> + <animation effect="slide" time="500" end="0,-300">WindowClose</animation> <layout>StackLayout</layout> <posX>80</posX> <posY>120</posY> @@ -29,8 +32,8 @@ <description>UitzendingGemist.nl</description> <type>button</type> <id>2</id> - <width>560</width> - <height>80</height> + <width>575</width> + <height>90</height> <textureNoFocus>nlgemist.png</textureNoFocus> <textureFocus>hover_nlgemist.png</textureFocus> <onup>17</onup> @@ -41,10 +44,8 @@ <description>RTL Gemist</description> <type>button</type> <id>3</id> - <width>560</width> - <height>80</height> - <textXOff>10</textXOff> - <textYOff>5</textYOff> + <width>575</width> + <height>90</height> <textureNoFocus>rtlgemist.png</textureNoFocus> <textureFocus>hover_rtlgemist.png</textureFocus> <ondown>2</ondown> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |