mediaportal-svn — SVN Update mailing list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(323) |
May
(296) |
Jun
(304) |
Jul
(397) |
Aug
(340) |
Sep
(437) |
Oct
(757) |
Nov
(528) |
Dec
(454) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(349) |
Feb
(363) |
Mar
(566) |
Apr
(705) |
May
(288) |
Jun
(247) |
Jul
(338) |
Aug
(320) |
Sep
(367) |
Oct
(334) |
Nov
(169) |
Dec
(203) |
| 2008 |
Jan
(429) |
Feb
(393) |
Mar
(816) |
Apr
(546) |
May
(275) |
Jun
(322) |
Jul
(288) |
Aug
(256) |
Sep
(262) |
Oct
(322) |
Nov
(211) |
Dec
(300) |
| 2009 |
Jan
(367) |
Feb
(218) |
Mar
(330) |
Apr
(314) |
May
(313) |
Jun
(347) |
Jul
(163) |
Aug
(217) |
Sep
(208) |
Oct
(295) |
Nov
(288) |
Dec
(306) |
| 2010 |
Jan
(330) |
Feb
(213) |
Mar
(302) |
Apr
(235) |
May
(231) |
Jun
(118) |
Jul
(63) |
Aug
(155) |
Sep
(194) |
Oct
(171) |
Nov
(268) |
Dec
(249) |
| 2011 |
Jan
(201) |
Feb
(284) |
Mar
(111) |
Apr
(103) |
May
(98) |
Jun
(55) |
Jul
(104) |
Aug
(69) |
Sep
(77) |
Oct
(28) |
Nov
(55) |
Dec
(17) |
| 2014 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
| 2016 |
Jan
|
Feb
(2) |
Mar
(2) |
Apr
|
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
(3) |
Nov
(2) |
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
1
(2) |
2
|
|
3
(2) |
4
(4) |
5
(6) |
6
(4) |
7
(6) |
8
(5) |
9
(9) |
|
10
(6) |
11
(12) |
12
(7) |
13
(2) |
14
(3) |
15
|
16
(2) |
|
17
(1) |
18
(4) |
19
(4) |
20
(1) |
21
(2) |
22
(7) |
23
|
|
24
(1) |
25
|
26
|
27
(3) |
28
|
29
(4) |
30
(6) |
|
From: <chemelli_sf@su...> - 2011-04-30 22:54:57
|
Author: chemelli_sf
Date: 2011-05-01 00:54:48 +0200 (Sun, 01 May 2011)
New Revision: 27843
Modified:
trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Common/Configuration/Handlers/FileHandler.cs
Log:
Updated 2 obsolete calls
Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Common/Configuration/Handlers/FileHandler.cs
===================================================================
--- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Common/Configuration/Handlers/FileHandler.cs 2011-04-30 22:49:47 UTC (rev 27842)
+++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Common/Configuration/Handlers/FileHandler.cs 2011-04-30 22:54:48 UTC (rev 27843)
@@ -174,7 +174,7 @@
{
try
{
- string result = ConfigurationSettings.AppSettings[ key ];
+ string result = ConfigurationManager.AppSettings[ key ];
if( result != null && result.Length > 0 )
{
return result;
@@ -189,7 +189,7 @@
{
try
{
- string result = ConfigurationSettings.AppSettings[ key ];
+ string result = ConfigurationManager.AppSettings[ key ];
if( result != null && result.Length > 0 )
{
return Path.Combine( result, CONFIG_FILENAME );
|
|
From: <chemelli_sf@su...> - 2011-04-30 22:49:55
|
Author: chemelli_sf
Date: 2011-05-01 00:49:47 +0200 (Sun, 01 May 2011)
New Revision: 27842
Modified:
trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Common/Gentle.Common.csproj
Log:
Fixed compile errors after solution upgrade to VS2010
Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Common/Gentle.Common.csproj
===================================================================
--- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Common/Gentle.Common.csproj 2011-04-30 17:11:26 UTC (rev 27841)
+++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Common/Gentle.Common.csproj 2011-04-30 22:49:47 UTC (rev 27842)
@@ -82,6 +82,7 @@
<Reference Include="System">
<Name>System</Name>
</Reference>
+ <Reference Include="System.configuration" />
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
|
|
From: <chemelli_sf@su...> - 2011-04-30 17:11:35
|
Author: chemelli_sf Date: 2011-04-30 19:11:26 +0200 (Sat, 30 Apr 2011) New Revision: 27841 Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Common/Gentle.Common.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Framework.Tests/Gentle.Framework.Tests.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Framework/Gentle.Framework.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.NET.sln trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.DB2/Gentle.Provider.DB2.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Firebird/Gentle.Provider.Firebird.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Jet/Gentle.Provider.Jet.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.MySQL/Gentle.Provider.MySQL.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Oracle/Gentle.Provider.Oracle.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.OracleODP/Gentle.Provider.OracleODP.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.PostgreSQL/Gentle.Provider.PostgreSQL.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SQLServer/Gentle.Provider.SQLServer.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SQLServerCE/Gentle.Provider.SQLServerCE.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SQLite/Gentle.Provider.SQLite.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Sybase/Gentle.Provider.Sybase.csproj trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SybaseASA/Gentle.Provider.SybaseASA.csproj Log: Upgraded solution and related projects to VS2010 Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Common/Gentle.Common.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Common/Gentle.Common.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Common/Gentle.Common.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.21022</ProductVersion> @@ -26,7 +27,8 @@ <UpgradeBackupLocation> </UpgradeBackupLocation> <SignAssembly>true</SignAssembly> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Framework/Gentle.Framework.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Framework/Gentle.Framework.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Framework/Gentle.Framework.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.21022</ProductVersion> @@ -26,7 +27,8 @@ <UpgradeBackupLocation> </UpgradeBackupLocation> <SignAssembly>true</SignAssembly> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Framework.Tests/Gentle.Framework.Tests.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Framework.Tests/Gentle.Framework.Tests.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Framework.Tests/Gentle.Framework.Tests.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.30729</ProductVersion> @@ -26,7 +27,8 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>..\..\Output\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.NET.sln =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.NET.sln 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.NET.sln 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,5 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AC1325E5-634F-4AC7-915E-8045D75D864B}" ProjectSection(SolutionItems) = preProject Gentle.snk = Gentle.snk Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.DB2/Gentle.Provider.DB2.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.DB2/Gentle.Provider.DB2.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.DB2/Gentle.Provider.DB2.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.21022</ProductVersion> @@ -25,8 +26,9 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <SignAssembly>true</SignAssembly> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Firebird/Gentle.Provider.Firebird.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Firebird/Gentle.Provider.Firebird.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Firebird/Gentle.Provider.Firebird.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.21022</ProductVersion> @@ -25,8 +26,9 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <SignAssembly>true</SignAssembly> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Jet/Gentle.Provider.Jet.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Jet/Gentle.Provider.Jet.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Jet/Gentle.Provider.Jet.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.21022</ProductVersion> @@ -25,8 +26,9 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <SignAssembly>true</SignAssembly> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.MySQL/Gentle.Provider.MySQL.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.MySQL/Gentle.Provider.MySQL.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.MySQL/Gentle.Provider.MySQL.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.30729</ProductVersion> @@ -25,8 +26,9 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <SignAssembly>true</SignAssembly> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Oracle/Gentle.Provider.Oracle.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Oracle/Gentle.Provider.Oracle.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Oracle/Gentle.Provider.Oracle.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.21022</ProductVersion> @@ -25,8 +26,9 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <SignAssembly>true</SignAssembly> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.OracleODP/Gentle.Provider.OracleODP.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.OracleODP/Gentle.Provider.OracleODP.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.OracleODP/Gentle.Provider.OracleODP.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.21022</ProductVersion> @@ -25,8 +26,9 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <SignAssembly>true</SignAssembly> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.PostgreSQL/Gentle.Provider.PostgreSQL.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.PostgreSQL/Gentle.Provider.PostgreSQL.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.PostgreSQL/Gentle.Provider.PostgreSQL.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.21022</ProductVersion> @@ -25,8 +26,9 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <SignAssembly>true</SignAssembly> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SQLServer/Gentle.Provider.SQLServer.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SQLServer/Gentle.Provider.SQLServer.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SQLServer/Gentle.Provider.SQLServer.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.21022</ProductVersion> @@ -25,8 +26,9 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <SignAssembly>true</SignAssembly> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SQLServerCE/Gentle.Provider.SQLServerCE.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SQLServerCE/Gentle.Provider.SQLServerCE.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SQLServerCE/Gentle.Provider.SQLServerCE.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.21022</ProductVersion> @@ -25,7 +26,7 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <PublishUrl>http://localhost/Gentle.Provider.SQLServerCE/</PublishUrl>; <Install>true</Install> <InstallFrom>Web</InstallFrom> @@ -42,6 +43,7 @@ <UseApplicationTrust>false</UseApplicationTrust> <BootstrapperEnabled>true</BootstrapperEnabled> <SignAssembly>true</SignAssembly> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SQLite/Gentle.Provider.SQLite.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SQLite/Gentle.Provider.SQLite.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SQLite/Gentle.Provider.SQLite.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>9.0.21022</ProductVersion> @@ -25,8 +26,9 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <SignAssembly>true</SignAssembly> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Sybase/Gentle.Provider.Sybase.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Sybase/Gentle.Provider.Sybase.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.Sybase/Gentle.Provider.Sybase.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>8.0.50727</ProductVersion> @@ -26,7 +27,8 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> Modified: trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SybaseASA/Gentle.Provider.SybaseASA.csproj =================================================================== --- trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SybaseASA/Gentle.Provider.SybaseASA.csproj 2011-04-30 14:00:59 UTC (rev 27840) +++ trunk/Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Provider.SybaseASA/Gentle.Provider.SybaseASA.csproj 2011-04-30 17:11:26 UTC (rev 27841) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0"> <PropertyGroup> <ProjectType>Local</ProjectType> <ProductVersion>8.0.50727</ProductVersion> @@ -26,7 +27,8 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> |
|
From: <flokel@su...> - 2011-04-30 14:01:07
|
Author: flokel Date: 2011-04-30 16:00:59 +0200 (Sat, 30 Apr 2011) New Revision: 27840 Modified: trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem Stockholm.xml Log: updated frequencies for Sweden.Comhem Stockholm Modified: trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem Stockholm.xml =================================================================== --- trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem Stockholm.xml 2011-04-30 08:43:19 UTC (rev 27839) +++ trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem Stockholm.xml 2011-04-30 14:00:59 UTC (rev 27840) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="UTF-8"?> <ArrayOfDVBCTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema">; <DVBCTuning> <Frequency>290000</Frequency> @@ -26,11 +26,6 @@ <SymbolRate>6875</SymbolRate> </DVBCTuning> <DVBCTuning> - <Frequency>330000</Frequency> - <ModulationType>ModNotSet</ModulationType> - <SymbolRate>6875</SymbolRate> - </DVBCTuning> - <DVBCTuning> <Frequency>338000</Frequency> <ModulationType>Mod64Qam</ModulationType> <SymbolRate>6875</SymbolRate> @@ -76,16 +71,46 @@ <SymbolRate>6875</SymbolRate> </DVBCTuning> <DVBCTuning> - <Frequency>410000</Frequency> + <Frequency>418000</Frequency> <ModulationType>Mod64Qam</ModulationType> <SymbolRate>6875</SymbolRate> </DVBCTuning> <DVBCTuning> - <Frequency>418000</Frequency> - <ModulationType>Mod64Qam</ModulationType> + <Frequency>434000</Frequency> + <ModulationType>Mod256Qam</ModulationType> <SymbolRate>6875</SymbolRate> </DVBCTuning> <DVBCTuning> + <Frequency>442000</Frequency> + <ModulationType>Mod256Qam</ModulationType> + <SymbolRate>6875</SymbolRate> + </DVBCTuning> + <DVBCTuning> + <Frequency>450000</Frequency> + <ModulationType>Mod256Qam</ModulationType> + <SymbolRate>6875</SymbolRate> + </DVBCTuning> + <DVBCTuning> + <Frequency>458000</Frequency> + <ModulationType>Mod256Qam</ModulationType> + <SymbolRate>6875</SymbolRate> + </DVBCTuning> + <DVBCTuning> + <Frequency>466000</Frequency> + <ModulationType>Mod256Qam</ModulationType> + <SymbolRate>6875</SymbolRate> + </DVBCTuning> + <DVBCTuning> + <Frequency>474000</Frequency> + <ModulationType>Mod256Qam</ModulationType> + <SymbolRate>6875</SymbolRate> + </DVBCTuning> + <DVBCTuning> + <Frequency>482000</Frequency> + <ModulationType>Mod256Qam</ModulationType> + <SymbolRate>6875</SymbolRate> + </DVBCTuning> + <DVBCTuning> <Frequency>714000</Frequency> <ModulationType>Mod64Qam</ModulationType> <SymbolRate>6875</SymbolRate> @@ -100,4 +125,14 @@ <ModulationType>Mod64Qam</ModulationType> <SymbolRate>6875</SymbolRate> </DVBCTuning> -</ArrayOfDVBCTuning> \ No newline at end of file + <DVBCTuning> + <Frequency>746000</Frequency> + <ModulationType>Mod256Qam</ModulationType> + <SymbolRate>6875</SymbolRate> + </DVBCTuning> + <DVBCTuning> + <Frequency>786000</Frequency> + <ModulationType>Mod256Qam</ModulationType> + <SymbolRate>6875</SymbolRate> + </DVBCTuning> +</ArrayOfDVBCTuning> |
|
From: <Jameson_uk@su...> - 2011-04-30 08:43:26
|
Author: Jameson_uk
Date: 2011-04-30 10:43:19 +0200 (Sat, 30 Apr 2011)
New Revision: 27839
Modified:
trunk/mediaportal/MediaPortal.Base/keymap.xml
Log:
Mantis 3295 - Removed link to MyMusicVideos (old plugin not community one)
Modified: trunk/mediaportal/MediaPortal.Base/keymap.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/keymap.xml 2011-04-30 08:39:23 UTC (rev 27838)
+++ trunk/mediaportal/MediaPortal.Base/keymap.xml 2011-04-30 08:43:19 UTC (rev 27839)
@@ -1091,22 +1091,6 @@
</action>
</window>
<window>
- <id>4734</id>
- <description>MyMusicVideo</description>
- <action>
- <id>34</id>
- <key>Y</key>
- <sound />
- <description>Add item to Playlist</description>
- </action>
- <action>
- <id>14</id>
- <key>F8</key>
- <sound />
- <description>Skip Next</description>
- </action>
- </window>
- <window>
<id>7700</id>
<description>Teletext (Windowed)</description>
<action>
|
|
From: <Jameson_uk@su...> - 2011-04-30 08:39:31
|
Author: Jameson_uk
Date: 2011-04-30 10:39:23 +0200 (Sat, 30 Apr 2011)
New Revision: 27838
Modified:
trunk/mediaportal/Core/guilib/GUIWindow.cs
trunk/mediaportal/Core/guilib/GraphicContext.cs
Log:
Mantis 3292 - Removed redundant window IDs WINDOW_RECORDEDTVGENRE and WINDOW_RECORDEDTVCHANNEL
Modified: trunk/mediaportal/Core/guilib/GUIWindow.cs
===================================================================
--- trunk/mediaportal/Core/guilib/GUIWindow.cs 2011-04-29 08:04:59 UTC (rev 27837)
+++ trunk/mediaportal/Core/guilib/GUIWindow.cs 2011-04-30 08:39:23 UTC (rev 27838)
@@ -99,8 +99,6 @@
WINDOW_TVFULLSCREEN = 602,
WINDOW_RECORDEDTV = 603,
WINDOW_SEARCHTV = 604,
- WINDOW_RECORDEDTVGENRE = 605,
- WINDOW_RECORDEDTVCHANNEL = 606,
WINDOW_TV_SCHEDULER_PRIORITIES = 607,
WINDOW_TV_CONFLICTS = 608,
WINDOW_VIDEO_ARTIST_INFO = 614,
Modified: trunk/mediaportal/Core/guilib/GraphicContext.cs
===================================================================
--- trunk/mediaportal/Core/guilib/GraphicContext.cs 2011-04-29 08:04:59 UTC (rev 27837)
+++ trunk/mediaportal/Core/guilib/GraphicContext.cs 2011-04-30 08:39:23 UTC (rev 27838)
@@ -1498,14 +1498,11 @@
case (int)GUIWindow.Window.WINDOW_TVFULLSCREEN:
case (int)GUIWindow.Window.WINDOW_TVGUIDE:
case (int)GUIWindow.Window.WINDOW_RECORDEDTV:
- case (int)GUIWindow.Window.WINDOW_RECORDEDTVCHANNEL:
- case (int)GUIWindow.Window.WINDOW_RECORDEDTVGENRE:
case (int)GUIWindow.Window.WINDOW_SCHEDULER:
case (int)GUIWindow.Window.WINDOW_SEARCHTV:
case (int)GUIWindow.Window.WINDOW_TELETEXT:
case (int)GUIWindow.Window.WINDOW_FULLSCREEN_TELETEXT:
case (int)GUIWindow.Window.WINDOW_TV_SCHEDULER_PRIORITIES:
- case (int)GUIWindow.Window.WINDOW_TV_CONFLICTS:
case (int)GUIWindow.Window.WINDOW_TV_NO_SIGNAL:
case (int)GUIWindow.Window.WINDOW_TV_PROGRAM_INFO:
return true;
|
|
From: <Jameson_uk@su...> - 2011-04-29 08:05:06
|
Author: Jameson_uk
Date: 2011-04-29 10:04:59 +0200 (Fri, 29 Apr 2011)
New Revision: 27837
Modified:
trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/Radio.cs
trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/RadioGuideBase.cs
Log:
Mantis 3514 - Changing radio station via EPG is not working
Modified: trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/Radio.cs
===================================================================
--- trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/Radio.cs 2011-04-29 07:42:50 UTC (rev 27836)
+++ trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/Radio.cs 2011-04-29 08:04:59 UTC (rev 27837)
@@ -877,70 +877,6 @@
UpdateButtonStates();
GUIControl.FocusControl(GetID, ((GUIControl)sender).GetID);
- }
-
- public static void UpdateCurrentChannel()
- {
- Channel newChannel = null;
- //if current card is watching tv then use that channel
- int id;
- if (TVHome.Connected)
- {
- if (TVHome.Card.IsTimeShifting || TVHome.Card.IsRecording)
- {
- id = TVHome.Card.IdChannel;
- if (id >= 0)
- {
- newChannel = Channel.Retrieve(id);
- }
- }
- else
- {
- // else if any card is recording
- // then get & use that channel
- if (TVHome.IsAnyCardRecording)
- {
- TvServer server = new TvServer();
- for (int i = 0; i < server.Count; ++i)
- {
- User user = new User();
- VirtualCard card = server.CardByIndex(user, i);
- if (card.IsRecording)
- {
- id = card.IdChannel;
- if (id >= 0)
- {
- newChannel = Channel.Retrieve(id);
- break;
- }
- }
- }
- }
- }
- if (newChannel == null)
- {
- newChannel = _currentChannel;
- }
-
- int currentChannelId = 0;
- int newChannelId = 0;
-
- if (_currentChannel != null)
- {
- currentChannelId = _currentChannel.IdChannel;
- }
-
- if (newChannel != null)
- {
- newChannelId = newChannel.IdChannel;
- }
-
- if (currentChannelId != newChannelId)
- {
- _currentChannel = newChannel;
- //_currentChannel.CurrentGroup = selectedGroup;
- }
- }
}
#region ISetupForm Members
Modified: trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/RadioGuideBase.cs
===================================================================
--- trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/RadioGuideBase.cs 2011-04-29 07:42:50 UTC (rev 27836)
+++ trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/RadioGuideBase.cs 2011-04-29 08:04:59 UTC (rev 27837)
@@ -3622,11 +3622,11 @@
private void OnSelectItem(bool isItemSelected)
{
- Radio.UpdateCurrentChannel();
if (_currentProgram == null)
{
return;
}
+ Radio.CurrentChannel = _currentChannel;
if (isItemSelected)
{
if (_currentProgram.IsRunningAt(DateTime.Now) || _currentProgram.EndTime <= DateTime.Now)
|
|
From: <Jameson_uk@su...> - 2011-04-29 07:42:57
|
Author: Jameson_uk
Date: 2011-04-29 09:42:50 +0200 (Fri, 29 Apr 2011)
New Revision: 27836
Modified:
trunk/mediaportal/WindowPlugins/GUIMusic/GUIMusicBaseWindow.cs
trunk/mediaportal/WindowPlugins/GUIMusic/GUIMusicFiles.cs
Log:
Mantis 3497 - CD playback from play disc button and autoplay not working
Modified: trunk/mediaportal/WindowPlugins/GUIMusic/GUIMusicBaseWindow.cs
===================================================================
--- trunk/mediaportal/WindowPlugins/GUIMusic/GUIMusicBaseWindow.cs 2011-04-29 07:36:13 UTC (rev 27835)
+++ trunk/mediaportal/WindowPlugins/GUIMusic/GUIMusicBaseWindow.cs 2011-04-29 07:42:50 UTC (rev 27836)
@@ -2039,7 +2039,7 @@
// not null check is needed here because we can play a CD from menu button
// without a facade item being selected
- if (iCurrentItemCount == 0 && facadeLayout.SelectedListItem != null)
+ if (iCurrentItemCount == 0 && facadeLayout != null && facadeLayout.SelectedListItem != null)
{
// if playlist has been cleared before calling this
// or there is nothing in existing playlist then
Modified: trunk/mediaportal/WindowPlugins/GUIMusic/GUIMusicFiles.cs
===================================================================
--- trunk/mediaportal/WindowPlugins/GUIMusic/GUIMusicFiles.cs 2011-04-29 07:36:13 UTC (rev 27835)
+++ trunk/mediaportal/WindowPlugins/GUIMusic/GUIMusicFiles.cs 2011-04-29 07:42:50 UTC (rev 27836)
@@ -1559,7 +1559,12 @@
// add tracks
if (PlayAllOnSingleItemPlayNow)
{
- GUIListItem selectedItem = facadeLayout.SelectedListItem;
+ GUIListItem selectedItem = null;
+ if (facadeLayout != null)
+ {
+ selectedItem = facadeLayout.SelectedListItem;
+ }
+
if (playCD)
{
// this is only set in PlayCD. Playback is requested for whole drive
@@ -1567,9 +1572,15 @@
// recursively
pl.Add(ConvertItemToPlaylist(item));
}
- else if (!selectedItem.IsFolder)
+ else if (selectedItem == null || selectedItem.IsFolder)
{
- // we have a track selected so add any other tracks which
+ // selected item was a folder (or playback started from outside of music plugin)
+ // so contents will get recursively added so just add item to playlist
+ pl.Add(ConvertItemToPlaylist(item));
+ }
+ else
+ {
+ // selected item was not a folder so add any other tracks which
// are on showing on the facade
for (int i = 0; i < facadeLayout.Count; i++)
{
@@ -1580,12 +1591,6 @@
}
}
}
- else
- {
- // selected item was a folder so contents will get
- // recursively added so just add item to playlist
- pl.Add(ConvertItemToPlaylist(item));
- }
}
else
{
|
|
From: <Jameson_uk@su...> - 2011-04-29 07:36:21
|
Author: Jameson_uk
Date: 2011-04-29 09:36:13 +0200 (Fri, 29 Apr 2011)
New Revision: 27835
Modified:
trunk/mediaportal/MediaPortal.Base/keymap.xml
Log:
Mantis 3295 - Removed link to MyRecipies
Modified: trunk/mediaportal/MediaPortal.Base/keymap.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/keymap.xml 2011-04-29 06:46:55 UTC (rev 27834)
+++ trunk/mediaportal/MediaPortal.Base/keymap.xml 2011-04-29 07:36:13 UTC (rev 27835)
@@ -1091,16 +1091,6 @@
</action>
</window>
<window>
- <id>750</id>
- <description>MyRecipes</description>
- <action>
- <id>80</id>
- <key>0</key>
- <sound />
- <description>delete item</description>
- </action>
- </window>
- <window>
<id>4734</id>
<description>MyMusicVideo</description>
<action>
|
|
From: <arion_p@su...> - 2011-04-29 06:47:06
|
Author: arion_p Date: 2011-04-29 08:46:55 +0200 (Fri, 29 Apr 2011) New Revision: 27834 Added: tags/Release 1.2.0 Beta/ Log: 1.2.0 Beta tag |
|
From: <flokel@su...> - 2011-04-27 20:11:54
|
Author: flokel Date: 2011-04-27 22:11:46 +0200 (Wed, 27 Apr 2011) New Revision: 27833 Added: trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Anglia.xml trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Rouncefall.xml Modified: trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sudbury.xml trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Tacolneston.xml Log: updated/added frequencies for Anglia, Rouncefall, Tacolneston & Sudbury UK Added: trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Anglia.xml =================================================================== --- trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Anglia.xml (rev 0) +++ trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Anglia.xml 2011-04-27 20:11:46 UTC (rev 27833) @@ -0,0 +1,203 @@ +<?xml version="1.0" encoding="utf-8"?> +<ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema">; + <DVBTTuning> + <Frequency>474000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>482000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>490000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>498000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>506000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>514000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>522000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>530000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>538000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>554000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>618000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>626000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>634000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>642000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>650000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>658000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>666000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>674000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>682000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>690000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>698000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>706000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>714000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>722000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>730000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>738000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>746000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>754000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>762000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>770000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>778000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>785000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>786000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>794000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>802000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>810000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>818000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>834000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>842000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>850000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> +</ArrayOfDVBTTuning> \ No newline at end of file Added: trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Rouncefall.xml =================================================================== --- trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Rouncefall.xml (rev 0) +++ trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Rouncefall.xml 2011-04-27 20:11:46 UTC (rev 27833) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema">; + <DVBTTuning> + <Frequency>634000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>658000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>682000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> +</ArrayOfDVBTTuning> \ No newline at end of file Modified: trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sudbury.xml =================================================================== --- trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sudbury.xml 2011-04-27 20:06:09 UTC (rev 27832) +++ trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sudbury.xml 2011-04-27 20:11:46 UTC (rev 27833) @@ -1,17 +1,62 @@ <?xml version="1.0" encoding="utf-8"?> <ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema">; <DVBTTuning> - <Frequency>698000</Frequency> + <Frequency>482000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>506000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>514000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>530000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>538000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>618000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>634000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> </DVBTTuning> <DVBTTuning> + <Frequency>642000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>658000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>682000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> <Frequency>690000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> <DVBTTuning> - <Frequency>618000</Frequency> + <Frequency>698000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> @@ -21,6 +66,21 @@ <Offset>167</Offset> </DVBTTuning> <DVBTTuning> + <Frequency>714000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>722000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>730000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> <Frequency>738000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> @@ -30,4 +90,29 @@ <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> + <DVBTTuning> + <Frequency>762000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>770000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>786000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>810000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>850000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> </ArrayOfDVBTTuning> \ No newline at end of file Modified: trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Tacolneston.xml =================================================================== --- trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Tacolneston.xml 2011-04-27 20:06:09 UTC (rev 27832) +++ trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Tacolneston.xml 2011-04-27 20:11:46 UTC (rev 27833) @@ -1,33 +1,173 @@ <?xml version="1.0" encoding="utf-8"?> <ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema">; <DVBTTuning> - <Frequency>810000</Frequency> + <Frequency>474000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> <DVBTTuning> - <Frequency>786000</Frequency> + <Frequency>482000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> <DVBTTuning> + <Frequency>490000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>498000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>506000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>514000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>522000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>530000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>538000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>634000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>642000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>650000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>658000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>666000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>674000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>682000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>690000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>698000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>706000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>714000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>722000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> <Frequency>730000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> <DVBTTuning> + <Frequency>746000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>754000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>762000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> <Frequency>770000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> <DVBTTuning> + <Frequency>778000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>786000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> <Frequency>794000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> <DVBTTuning> + <Frequency>802000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>810000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> <Frequency>818000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> + <DVBTTuning> + <Frequency>834000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>850000</Frequency> + <BandWidth>8</BandWidth> + <Offset>167</Offset> + </DVBTTuning> </ArrayOfDVBTTuning> \ No newline at end of file |
|
From: <flokel@su...> - 2011-04-27 20:06:18
|
Author: flokel Date: 2011-04-27 22:06:09 +0200 (Wed, 27 Apr 2011) New Revision: 27832 Modified: trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Fenton.xml Log: updated frequencies for UK.Fenton Modified: trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Fenton.xml =================================================================== --- trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Fenton.xml 2011-04-27 08:23:46 UTC (rev 27831) +++ trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Fenton.xml 2011-04-27 20:06:09 UTC (rev 27832) @@ -1,32 +1,32 @@ <?xml version="1.0" encoding="utf-8"?> -<ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema">; +<ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema">; <DVBTTuning> - <Frequency>578000</Frequency> + <Frequency>482000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> <DVBTTuning> - <Frequency>546000</Frequency> + <Frequency>506000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> <DVBTTuning> - <Frequency>482000</Frequency> + <Frequency>530000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> <DVBTTuning> - <Frequency>506000</Frequency> + <Frequency>562000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> <DVBTTuning> - <Frequency>530000</Frequency> + <Frequency>570000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> - <DVBTTuning> - <Frequency>562000</Frequency> + <DVBTTuning> + <Frequency>578000</Frequency> <BandWidth>8</BandWidth> <Offset>167</Offset> </DVBTTuning> |
|
From: <owlsroost@su...> - 2011-04-27 08:23:54
|
Author: owlsroost
Date: 2011-04-27 10:23:46 +0200 (Wed, 27 Apr 2011)
New Revision: 27831
Modified:
branches/Accurate_sync/dshowhelper_DWM_mod/source/EVRCustomPresenter.cpp
Log:
Small mod to GetCycleDifference()
Modified: branches/Accurate_sync/dshowhelper_DWM_mod/source/EVRCustomPresenter.cpp
===================================================================
--- branches/Accurate_sync/dshowhelper_DWM_mod/source/EVRCustomPresenter.cpp 2011-04-24 05:48:34 UTC (rev 27830)
+++ branches/Accurate_sync/dshowhelper_DWM_mod/source/EVRCustomPresenter.cpp 2011-04-27 08:23:46 UTC (rev 27831)
@@ -86,11 +86,11 @@
LogRotate();
if (NO_MP_AUD_REND)
{
- Log("---------- v1.4.078 part DWM ----------- instance 0x%x", this);
+ Log("---------- v1.4.079 part DWM ----------- instance 0x%x", this);
}
else
{
- Log("---------- v0.0.078 part DWM ----------- instance 0x%x", this);
+ Log("---------- v0.0.079 part DWM ----------- instance 0x%x", this);
Log("--- audio renderer testing --- instance 0x%x", this);
}
m_hMonitor = monitor;
@@ -3380,7 +3380,7 @@
for (j = 1; j <= 2; j++)
{
double dFrameCycle = j * m_dFrameCycle;
- for (i = 1; i <= 8; i++)
+ for (i = 1; i <= 4; i++)
{
double dDisplayCycle = i * dBaseDisplayCycle;
double diff = (dDisplayCycle - dFrameCycle) / dFrameCycle;
|
|
From: <ajp5199@su...> - 2011-04-24 05:48:43
|
Author: ajp5199 Date: 2011-04-24 07:48:34 +0200 (Sun, 24 Apr 2011) New Revision: 27830 Added: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/tvguide_highlight_border.png branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvguide_highlight_border.png Log: Add missing tvguide_highlight_border.png to Default(Wide) skins Added: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/tvguide_highlight_border.png =================================================================== (Binary files differ) Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/tvguide_highlight_border.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvguide_highlight_border.png =================================================================== (Binary files differ) Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvguide_highlight_border.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream |
Author: ajp5199
Date: 2011-04-23 00:17:48 +0200 (Sat, 23 Apr 2011)
New Revision: 27829
Added:
branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml
Modified:
branches/ajp8164_13/
branches/ajp8164_13/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh
branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sandy Heath.xml
branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVConflictDialog.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVNotifyYesNoDialog.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVProgramDescription.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvSetup.cs
branches/ajp8164_13/mediaportal/Configuration/Resources/remote.Mce2004.png
branches/ajp8164_13/mediaportal/Configuration/Resources/remote.Mce2005TT.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3/
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3/Media/hover_LastFmRadio.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3wide/
branches/ajp8164_13/mediaportal/MiniDisplayLibrary/
branches/ajp8164_13/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd.gif
branches/ajp8164_13/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd_deactivated.gif
Log:
Update with merges from trunk.
Property changes on: branches/ajp8164_13
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:27133-27822
+ /trunk:27133-27828
Modified: branches/ajp8164_13/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh
===================================================================
--- branches/ajp8164_13/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh 2011-04-22 21:06:09 UTC (rev 27828)
+++ branches/ajp8164_13/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh 2011-04-22 22:17:48 UTC (rev 27829)
@@ -32,7 +32,7 @@
!define VER_MAJOR 1
!define VER_MINOR 1
-!define VER_REVISION 6
+!define VER_REVISION 7
!ifndef VER_BUILD
!define VER_BUILD 0
!endif
Copied: branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml (from rev 27828, trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml)
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml (rev 0)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml 2011-04-22 22:17:48 UTC (rev 27829)
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema">;
+ <DVBTTuning>
+ <Frequency>474000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>482000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>490000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>498000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>506000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>514000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>522000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>530000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>538000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>546000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>554000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>562000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>570000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>578000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>586000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>594000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>602000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>610000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>618000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>626000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>634000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>642000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>650000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>658000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>666000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>674000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>682000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>690000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>698000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>706000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>714000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>722000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>730000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>738000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>746000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>754000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>762000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>777000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>778000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>786000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>794000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>802000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>810000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>818000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>826000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>834000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>842000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>850000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>858000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>125</Offset>
+ </DVBTTuning>
+</ArrayOfDVBTTuning>
\ No newline at end of file
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sandy Heath.xml
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sandy Heath.xml 2011-04-22 21:06:09 UTC (rev 27828)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sandy Heath.xml 2011-04-22 22:17:48 UTC (rev 27829)
@@ -41,6 +41,11 @@
<Offset>167</Offset>
</DVBTTuning>
<DVBTTuning>
+ <Frequency>706000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
<Frequency>714000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
@@ -50,4 +55,34 @@
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
+ <DVBTTuning>
+ <Frequency>730000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>746000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>762000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>778000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>785000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>842000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
</ArrayOfDVBTTuning>
\ No newline at end of file
Property changes on: branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVConflictDialog.cs
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVConflictDialog.cs:2-27822
+ /trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVConflictDialog.cs:2-27828
Property changes on: branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVNotifyYesNoDialog.cs
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVNotifyYesNoDialog.cs:2-27822
+ /trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVNotifyYesNoDialog.cs:2-27828
Property changes on: branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVProgramDescription.cs
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVProgramDescription.cs:2-27822
+ /trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVProgramDescription.cs:2-27828
Property changes on: branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvSetup.cs
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ajp8164_stage/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvSetup.cs:23820-26119
/trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvSetup.cs:2-11022,27133-27822
+ /branches/ajp8164_stage/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvSetup.cs:23820-26119
/trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvSetup.cs:2-11022,27133-27828
Property changes on: branches/ajp8164_13/mediaportal/Configuration/Resources/remote.Mce2004.png
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/mediaportal/Configuration/Resources/remote.Mce2004.png:2-20702,27133-27822
+ /trunk/mediaportal/Configuration/Resources/remote.Mce2004.png:2-20702,27133-27828
Property changes on: branches/ajp8164_13/mediaportal/Configuration/Resources/remote.Mce2005TT.png
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/mediaportal/Configuration/Resources/remote.Mce2005TT.png:2-20702,27133-27822
+ /trunk/mediaportal/Configuration/Resources/remote.Mce2005TT.png:2-20702,27133-27828
Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/mediaportal/MediaPortal.Base/skin/Blue3:27782-27822
+ /trunk/mediaportal/MediaPortal.Base/skin/Blue3:27782-27828
Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3/Media/hover_LastFmRadio.png
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/mediaportal/MediaPortal.Base/skin/Blue3/Media/hover_LastFmRadio.png:2-20432,20623-21894,27133-27822
+ /trunk/mediaportal/MediaPortal.Base/skin/Blue3/Media/hover_LastFmRadio.png:2-20432,20623-21894,27133-27828
Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3wide
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/mediaportal/MediaPortal.Base/skin/Blue3wide:27782-27822
+ /trunk/mediaportal/MediaPortal.Base/skin/Blue3wide:27782-27828
Property changes on: branches/ajp8164_13/mediaportal/MiniDisplayLibrary
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/mediaportal/MiniDisplayLibrary:2-20901,27133-27822
+ /trunk/mediaportal/MiniDisplayLibrary:2-20901,27133-27828
Property changes on: branches/ajp8164_13/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd.gif:2-20901,27133-27822
+ /trunk/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd.gif:2-20901,27133-27828
Property changes on: branches/ajp8164_13/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd_deactivated.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd_deactivated.gif:2-20901,27133-27822
+ /trunk/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd_deactivated.gif:2-20901,27133-27828
|
|
From: <ajp5199@su...> - 2011-04-22 21:06:18
|
Author: ajp5199
Date: 2011-04-22 23:06:09 +0200 (Fri, 22 Apr 2011)
New Revision: 27828
Modified:
branches/ajp8164_13/mediaportal/Core/guilib/GUIMenuButton.cs
branches/ajp8164_13/mediaportal/Core/guilib/GUISpinControl.cs
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/references.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/references.xml
Log:
Fix for controlling the coloring of the text in GUIMenuButton when the spin button is used.
Modified: branches/ajp8164_13/mediaportal/Core/guilib/GUIMenuButton.cs
===================================================================
--- branches/ajp8164_13/mediaportal/Core/guilib/GUIMenuButton.cs 2011-04-22 20:08:05 UTC (rev 27827)
+++ branches/ajp8164_13/mediaportal/Core/guilib/GUIMenuButton.cs 2011-04-22 21:06:09 UTC (rev 27828)
@@ -640,6 +640,7 @@
break;
}
+ _spinControl.TextColor = Disabled ? _disabledColor : Focus ? _textColor : _textColorNoFocus;
_spinControl.SetPosition(x, y);
_spinControl.Render(timePassed);
}
Modified: branches/ajp8164_13/mediaportal/Core/guilib/GUISpinControl.cs
===================================================================
--- branches/ajp8164_13/mediaportal/Core/guilib/GUISpinControl.cs 2011-04-22 20:08:05 UTC (rev 27827)
+++ branches/ajp8164_13/mediaportal/Core/guilib/GUISpinControl.cs 2011-04-22 21:06:09 UTC (rev 27828)
@@ -1074,6 +1074,7 @@
public long TextColor
{
get { return _textColor; }
+ set { _textColor = value; }
}
public string FontName
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/references.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/references.xml 2011-04-22 20:08:05 UTC (rev 27827)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/references.xml 2011-04-22 21:06:09 UTC (rev 27828)
@@ -93,7 +93,7 @@
<dialogTitle></dialogTitle>
<dialogShowNumbers>no</dialogShowNumbers>
<font>font12</font>
- <textcolor>ffa9d0f7</textcolor>
+ <textcolor>ffffffff</textcolor>
<colordiffuse>ffffffff</colordiffuse>
<disabledcolor>ff808080</disabledcolor>
<textcolorNoFocus>ffa9d0f7</textcolorNoFocus>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/references.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/references.xml 2011-04-22 20:08:05 UTC (rev 27827)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/references.xml 2011-04-22 21:06:09 UTC (rev 27828)
@@ -92,7 +92,7 @@
<dialogTitle></dialogTitle>
<dialogShowNumbers>no</dialogShowNumbers>
<font>font12</font>
- <textcolor>ffa9d0f7</textcolor>
+ <textcolor>ffffffff</textcolor>
<colordiffuse>ffffffff</colordiffuse>
<disabledcolor>ff808080</disabledcolor>
<textcolorNoFocus>ffa9d0f7</textcolorNoFocus>
|
|
From: <ajp5199@su...> - 2011-04-22 20:08:15
|
Author: ajp5199
Date: 2011-04-22 22:08:05 +0200 (Fri, 22 Apr 2011)
New Revision: 27827
Added:
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/small_vbutton_colorize_overlay.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/small_vbutton_lr_colorize.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/tvguide_button_middle_colorize.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/tvguide_button_middle_colorize_overlay.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/settings_weather.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/small_vbutton_colorize_overlay.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/small_vbutton_lr_colorize.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvguide_button_middle_colorize.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvguide_button_middle_colorize_overlay.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/settings_weather.xml
Modified:
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mymusicgenres.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mymusicplaylist.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mymusicsongs.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mypics.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myradio.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myradiorecorded.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mytvguide.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mytvrecordedtv.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myvideo.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myvideoTitle.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myvideoplaylist.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myweather.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/references.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/settings.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mymusicgenres.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mymusicplaylist.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mymusicsongs.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mypics.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myradio.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myradiorecorded.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mytvguide.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mytvrecordedtv.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myvideo.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myvideoTitle.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myvideoplaylist.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myweather.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/references.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/settings.xml
Log:
Updated new Default and DefaultWide skins to work with GUIMenuButton, tvguide changes, and weather settings.
Added: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/small_vbutton_colorize_overlay.png
===================================================================
(Binary files differ)
Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/small_vbutton_colorize_overlay.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/small_vbutton_lr_colorize.png
===================================================================
(Binary files differ)
Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/small_vbutton_lr_colorize.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/tvguide_button_middle_colorize.png
===================================================================
(Binary files differ)
Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/tvguide_button_middle_colorize.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/tvguide_button_middle_colorize_overlay.png
===================================================================
(Binary files differ)
Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/Media/tvguide_button_middle_colorize_overlay.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mymusicgenres.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mymusicgenres.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mymusicgenres.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -168,25 +168,33 @@
<posY>96</posY>
<control>
<description>View-As</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
<posX>39</posX>
<posY>96</posY>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>5</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Switch View</description>
- <type>button</type>
+ <type>menubutton</type>
<id>5</id>
<posX>39</posX>
<posY>130</posY>
- <label>457</label>
+ <label></label>
<onright>50</onright>
<onup>2</onup>
<ondown>3</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<description>Sort</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mymusicplaylist.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mymusicplaylist.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mymusicplaylist.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -164,12 +164,16 @@
<visible>!Control.HasFocus(50)</visible>
<control>
<description>View-As button</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>20</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<description>Shuffle button</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mymusicsongs.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mymusicsongs.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mymusicsongs.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -169,25 +169,33 @@
<visible>!Control.HasFocus(50)</visible>
<control>
<description>View-As</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
<posX>39</posX>
<posY>96</posY>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>5</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Switch View</description>
- <type>button</type>
+ <type>menubutton</type>
<id>5</id>
<posX>39</posX>
<posY>130</posY>
- <label>457</label>
+ <label></label>
<onright>50</onright>
<onup>2</onup>
<ondown>3</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<description>Sort</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mypics.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mypics.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mypics.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -168,12 +168,16 @@
<visible>!Control.HasFocus(50)</visible>
<control>
<description>View-As</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>3</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Sort</description>
@@ -186,12 +190,16 @@
</control>
<control>
<description>Switch View</description>
- <type>button</type>
+ <type>menubutton</type>
<id>5</id>
- <label>457</label>
+ <label></label>
<onright>50</onright>
<ondown>6</ondown>
<onup>3</onup>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<description>SlideShow button</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myradio.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myradio.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myradio.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -170,12 +170,16 @@
<visible>!Control.HasFocus(50)</visible>
<control>
<description>View-As</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>3</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Sort</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myradiorecorded.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myradiorecorded.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myradiorecorded.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -65,14 +65,18 @@
<posY>96</posY>
<layout>StackLayout</layout>
<control>
- <type>button</type>
+ <type>menubutton</type>
<description>View-As button</description>
<id>2</id>
<onleft>2</onleft>
<onright>50</onright>
<onup>17</onup>
<ondown>3</ondown>
- <label>100</label>
+ <label></label>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<type>sortbutton</type>
@@ -84,14 +88,18 @@
<label>620</label>
</control>
<control>
- <type>button</type>
+ <type>menubutton</type>
<description>All,Genre,Channel button</description>
<id>5</id>
<onleft>5</onleft>
<onright>50</onright>
<onup>3</onup>
<ondown>6</ondown>
- <label>457</label>
+ <label></label>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<type>button</type>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mytvguide.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mytvguide.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mytvguide.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -272,14 +272,20 @@
</control>
<control>
<description>TvGroup button</description>
- <type>button</type>
+ <type>button3part</type>
<id>100</id>
<posX>18</posX>
<posY>66</posY>
<width>25</width>
<height>340</height>
- <textureFocus>small_vbutton_focus.png</textureFocus>
- <textureNoFocus>small_vbutton_nofocus.png</textureNoFocus>
+ <textureFocusedLeft>small_vbutton_lr_colorize.png</textureFocusedLeft>
+ <textureNonFocusedLeft>small_vbutton_lr_colorize.png</textureNonFocusedLeft>
+ <textureFocusedMid>small_vbutton_focus.png</textureFocusedMid>
+ <textureNonFocusedMid>small_vbutton_nofocus.png</textureNonFocusedMid>
+ <textureFocusedRight>small_vbutton_lr_colorize.png</textureFocusedRight>
+ <textureNonFocusedRight>small_vbutton_lr_colorize.png</textureNonFocusedRight>
+ <textureIcon>-</textureIcon>
+ <textureIcon2>-</textureIcon2>
<label />
<onleft>60</onleft>
<onright>6</onright>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mytvrecordedtv.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mytvrecordedtv.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mytvrecordedtv.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -52,14 +52,18 @@
<posY>96</posY>
<layout>StackLayout</layout>
<control>
- <type>button</type>
+ <type>menubutton</type>
<description>View-As button</description>
<id>2</id>
<onleft>2</onleft>
<onright>50</onright>
<onup>17</onup>
<ondown>3</ondown>
- <label>100</label>
+ <label></label>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<type>sortbutton</type>
@@ -71,14 +75,18 @@
<label>620</label>
</control>
<control>
- <type>button</type>
+ <type>menubutton</type>
<description>All,Genre,Channel button</description>
<id>5</id>
<onleft>5</onleft>
<onright>50</onright>
<onup>3</onup>
<ondown>6</ondown>
- <label>457</label>
+ <label></label>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<type>button</type>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myvideo.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myvideo.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myvideo.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -169,12 +169,16 @@
<visible>!Control.HasFocus(50)</visible>
<control>
<description>View-As</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>3</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Sort</description>
@@ -187,12 +191,16 @@
</control>
<control>
<description>Switch View</description>
- <type>button</type>
+ <type>menubutton</type>
<id>5</id>
- <label>457</label>
+ <label></label>
<onright>50</onright>
<onup>3</onup>
<ondown>6</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<description>Play DVD</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myvideoTitle.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myvideoTitle.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myvideoTitle.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -169,12 +169,16 @@
<visible>!Control.HasFocus(50)</visible>
<control>
<description>View-As</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>3</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Sort</description>
@@ -187,12 +191,16 @@
</control>
<control>
<description>Switch View</description>
- <type>button</type>
+ <type>menubutton</type>
<id>5</id>
- <label>457</label>
+ <label></label>
<onright>50</onright>
<onup>3</onup>
<ondown>6</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<description>Play DVD</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myvideoplaylist.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myvideoplaylist.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myvideoplaylist.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -51,12 +51,16 @@
<layout>StackLayout</layout>
<control>
<description>View-As button</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>20</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Shuffle button</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myweather.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myweather.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myweather.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -52,9 +52,19 @@
<type>button</type>
<id>5</id>
<label>1028</label>
- <ondown>2</ondown>
+ <ondown>6</ondown>
<onright>5</onright>
</control>
+ <control>
+ <description>weather settings</description>
+ <type>button</type>
+ <id>6</id>
+ <label>5</label>
+ <ondown>2</ondown>
+ <onright>6</onright>
+ <hyperlink>17</hyperlink>
+ <visible>control.isvisible(5)</visible>
+ </control>
</control>
<control>
<description>TWC Logo</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/references.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/references.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/references.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -69,6 +69,46 @@
<shadowColor>ff000000</shadowColor>
</control>
<control>
+ <description>default menubutton</description>
+ <type>menubutton</type>
+ <id>0</id>
+ <mode>spinlist</mode>
+ <width>146</width>
+ <height>28</height>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>18</spinWidth>
+ <spinHeight>18</spinHeight>
+ <spinXOff>13</spinXOff>
+ <spinTextXOff>7</spinTextXOff>
+ <spinTextYOff>2</spinTextYOff>
+ <spinalign>right</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <showrange>no</showrange>
+ <reverse>no</reverse>
+ <cycleItems>yes</cycleItems>
+ <dialogTitle></dialogTitle>
+ <dialogShowNumbers>no</dialogShowNumbers>
+ <font>font12</font>
+ <textcolor>ffa9d0f7</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ <disabledcolor>ff808080</disabledcolor>
+ <textcolorNoFocus>ffa9d0f7</textcolorNoFocus>
+ <dimColor>ff000000</dimColor>
+ <shadowAngle>45</shadowAngle>
+ <shadowDistance>3</shadowDistance>
+ <shadowColor>ff000000</shadowColor>
+ <textXOff>10</textXOff>
+ <textYOff>5</textYOff>
+ <textureFocus>button_focus.png</textureFocus>
+ <textureNoFocus>button_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="105,105" time="50">focus</animation>
+ <animation effect="zoom" start="105,105" end="100,100" time="0">unfocus</animation>
+ </control>
+ <control>
<description>default updownbutton</description>
<type>updownbutton</type>
<id>0</id>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/settings.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/settings.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/settings.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -76,6 +76,14 @@
<hyperlink>14</hyperlink>
</control>
<control>
+ <description>Weather</description>
+ <type>button</type>
+ <id>12</id>
+ <width>197</width>
+ <label>8</label>
+ <hyperlink>17</hyperlink>
+ </control>
+ <control>
<description>MiniDisplay</description>
<type>button</type>
<id>11</id>
Added: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/settings_weather.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/settings_weather.xml (rev 0)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/settings_weather.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<window>
+ <id>17</id>
+ <defaultcontrol>21</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.label:400</define>
+ <define>#header.image:settings_logo.png</define>
+ <define>#header.hover:hover_my weather.png</define>
+ <controls>
+ <import>common.settings.xml</import>
+ <control>
+ <description>buttons</description>
+ <type>group</type>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="150" start="800,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="800,0">WindowClose</animation>
+ <posX>135</posX>
+ <posY>165</posY>
+ <layout>StackLayout(4)</layout>
+ <control>
+ <description>Add Location</description>
+ <type>button</type>
+ <id>21</id>
+ <width>450</width>
+ <height>31</height>
+ <label>1650</label>
+ <onup>17</onup>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="102,102" time="100">focus</animation>
+ <animation effect="zoom" start="102,102" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>Remove Location</description>
+ <type>button</type>
+ <id>22</id>
+ <width>450</width>
+ <height>31</height>
+ <label>1651</label>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="102,102" time="100">focus</animation>
+ <animation effect="zoom" start="102,102" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>Default Location</description>
+ <type>menubutton</type>
+ <id>23</id>
+ <width>450</width>
+ <height>31</height>
+ <label></label>
+ <mode>dialoglist</mode>
+ <dialogTitle>1652</dialogTitle>
+ <dialogShowNumbers>no</dialogShowNumbers>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText join=" ">#(string.format('{0}:', L(1652)))</valuePrefixText>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="102,102" time="100">focus</animation>
+ <animation effect="zoom" start="102,102" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>Temperature Units</description>
+ <type>menubutton</type>
+ <id>24</id>
+ <width>450</width>
+ <height>31</height>
+ <label>1653</label>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="102,102" time="100">focus</animation>
+ <animation effect="zoom" start="102,102" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>Wind Speed Units</description>
+ <type>menubutton</type>
+ <id>25</id>
+ <width>450</width>
+ <height>31</height>
+ <label>1654</label>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="102,102" time="100">focus</animation>
+ <animation effect="zoom" start="102,102" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>Refresh Interval</description>
+ <type>menubutton</type>
+ <id>26</id>
+ <width>450</width>
+ <height>31</height>
+ <label>1655</label>
+ <spintype>int</spintype>
+ <valueSuffixText>1656</valueSuffixText>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="102,102" time="100">focus</animation>
+ <animation effect="zoom" start="102,102" end="100,100" time="300">unfocus</animation>
+ </control>
+ </control>
+ </controls>
+</window>
\ No newline at end of file
Added: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/small_vbutton_colorize_overlay.png
===================================================================
(Binary files differ)
Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/small_vbutton_colorize_overlay.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/small_vbutton_lr_colorize.png
===================================================================
(Binary files differ)
Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/small_vbutton_lr_colorize.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvguide_button_middle_colorize.png
===================================================================
(Binary files differ)
Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvguide_button_middle_colorize.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvguide_button_middle_colorize_overlay.png
===================================================================
(Binary files differ)
Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvguide_button_middle_colorize_overlay.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mymusicgenres.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mymusicgenres.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mymusicgenres.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -167,25 +167,33 @@
<posY>121</posY>
<control>
<description>View-As</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
<posX>71</posX>
<posY>121</posY>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>5</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Switch View</description>
- <type>button</type>
+ <type>menubutton</type>
<id>5</id>
<posX>71</posX>
<posY>163</posY>
- <label>457</label>
+ <label></label>
<onright>50</onright>
<onup>2</onup>
<ondown>3</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<description>Sort</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mymusicplaylist.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mymusicplaylist.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mymusicplaylist.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -165,12 +165,16 @@
<visible>!Control.HasFocus(50)</visible>
<control>
<description>View-As button</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>20</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<description>Shuffle button</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mymusicsongs.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mymusicsongs.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mymusicsongs.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -168,25 +168,33 @@
<visible>!Control.HasFocus(50)</visible>
<control>
<description>View-As</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
<posX>71</posX>
<posY>121</posY>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>5</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Switch View</description>
- <type>button</type>
+ <type>menubutton</type>
<id>5</id>
<posX>71</posX>
<posY>163</posY>
- <label>457</label>
+ <label></label>
<onright>50</onright>
<onup>2</onup>
<ondown>3</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<description>Sort</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mypics.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mypics.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mypics.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -167,12 +167,16 @@
<visible>!Control.HasFocus(50)</visible>
<control>
<description>View-As</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>3</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Sort</description>
@@ -185,12 +189,16 @@
</control>
<control>
<description>Switch View</description>
- <type>button</type>
+ <type>menubutton</type>
<id>5</id>
- <label>457</label>
+ <label></label>
<onright>50</onright>
<ondown>6</ondown>
<onup>3</onup>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<description>SlideShow button</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myradio.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myradio.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myradio.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -169,12 +169,16 @@
<visible>!Control.HasFocus(50)</visible>
<control>
<description>View-As</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>3</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Sort</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myradiorecorded.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myradiorecorded.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myradiorecorded.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -65,14 +65,18 @@
<posY>121</posY>
<layout>StackLayout</layout>
<control>
- <type>button</type>
+ <type>menubutton</type>
<description>View-As button</description>
<id>2</id>
<onleft>2</onleft>
<onright>50</onright>
<onup>17</onup>
<ondown>3</ondown>
- <label>100</label>
+ <label></label>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<type>sortbutton</type>
@@ -84,14 +88,18 @@
<label>620</label>
</control>
<control>
- <type>button</type>
+ <type>menubutton</type>
<description>All,Genre,Channel button</description>
<id>5</id>
<onleft>5</onleft>
<onright>50</onright>
<onup>3</onup>
<ondown>6</ondown>
- <label>457</label>
+ <label></label>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<type>button</type>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mytvguide.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mytvguide.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mytvguide.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -272,14 +272,20 @@
</control>
<control>
<description>TvGroup button</description>
- <type>button</type>
+ <type>button3part</type>
<id>100</id>
<posX>32</posX>
<posY>83</posY>
<width>45</width>
<height>425</height>
- <textureFocus>small_vbutton_focus.png</textureFocus>
- <textureNoFocus>small_vbutton_nofocus.png</textureNoFocus>
+ <textureFocusedLeft>small_vbutton_lr_colorize.png</textureFocusedLeft>
+ <textureNonFocusedLeft>small_vbutton_lr_colorize.png</textureNonFocusedLeft>
+ <textureFocusedMid>small_vbutton_focus.png</textureFocusedMid>
+ <textureNonFocusedMid>small_vbutton_nofocus.png</textureNonFocusedMid>
+ <textureFocusedRight>small_vbutton_lr_colorize.png</textureFocusedRight>
+ <textureNonFocusedRight>small_vbutton_lr_colorize.png</textureNonFocusedRight>
+ <textureIcon>-</textureIcon>
+ <textureIcon2>-</textureIcon2>
<label></label>
<onleft>60</onleft>
<onright>6</onright>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mytvrecordedtv.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mytvrecordedtv.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mytvrecordedtv.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -52,15 +52,19 @@
<posY>121</posY>
<layout>StackLayout</layout>
<control>
- <type>button</type>
+ <type>menubutton</type>
<description>View-As button</description>
<id>2</id>
<onleft>2</onleft>
<onright>50</onright>
<onup>17</onup>
<ondown>3</ondown>
- <label>100</label>
- </control>
+ <label></label>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
+ </control>
<control>
<type>sortbutton</type>
<id>3</id>
@@ -71,14 +75,18 @@
<label>620</label>
</control>
<control>
- <type>button</type>
+ <type>menubutton</type>
<description>All,Genre,Channel button</description>
<id>5</id>
<onleft>5</onleft>
<onright>50</onright>
<onup>3</onup>
<ondown>6</ondown>
- <label>457</label>
+ <label></label>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<type>button</type>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myvideo.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myvideo.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myvideo.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -169,12 +169,16 @@
<visible>!Control.HasFocus(50)</visible>
<control>
<description>View-As</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>3</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Sort</description>
@@ -187,12 +191,16 @@
</control>
<control>
<description>Switch View</description>
- <type>button</type>
+ <type>menubutton</type>
<id>5</id>
- <label>457</label>
+ <label></label>
<onright>50</onright>
<onup>3</onup>
<ondown>6</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<description>Play DVD</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myvideoTitle.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myvideoTitle.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myvideoTitle.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -169,12 +169,16 @@
<visible>!Control.HasFocus(50)</visible>
<control>
<description>View-As</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>3</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Sort</description>
@@ -187,12 +191,16 @@
</control>
<control>
<description>Switch View</description>
- <type>button</type>
+ <type>menubutton</type>
<id>5</id>
- <label>457</label>
+ <label></label>
<onright>50</onright>
<onup>3</onup>
<ondown>6</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>499</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>97</valuePrefixText>
</control>
<control>
<description>Play DVD</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myvideoplaylist.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myvideoplaylist.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myvideoplaylist.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -50,12 +50,16 @@
<layout>StackLayout</layout>
<control>
<description>View-As button</description>
- <type>button</type>
+ <type>menubutton</type>
<id>2</id>
- <label>100</label>
+ <label></label>
<onright>50</onright>
<onup>17</onup>
<ondown>20</ondown>
+ <mode>dialoglist</mode>
+ <dialogTitle>792</dialogTitle>
+ <valueTextInButton>yes</valueTextInButton>
+ <valuePrefixText>95</valuePrefixText>
</control>
<control>
<description>Shuffle button</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myweather.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myweather.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myweather.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -21,7 +21,7 @@
<description>group element</description>
<layout>StackLayout</layout>
<posX>71</posX>
- <posY>158</posY>
+ <posY>138</posY>
<control>
<description>Switch Button</description>
<type>button</type>
@@ -49,9 +49,19 @@
<type>button</type>
<id>5</id>
<label>1028</label>
- <ondown>2</ondown>
+ <ondown>6</ondown>
<onright>5</onright>
</control>
+ <control>
+ <description>weather settings</description>
+ <type>button</type>
+ <id>6</id>
+ <label>5</label>
+ <ondown>2</ondown>
+ <onright>6</onright>
+ <hyperlink>17</hyperlink>
+ <visible>control.isvisible(5)</visible>
+ </control>
</control>
<control>
<description>TWC Logo</description>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/references.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/references.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/references.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -68,6 +68,46 @@
<shadowColor>ff000000</shadowColor>
</control>
<control>
+ <description>default menubutton</description>
+ <type>menubutton</type>
+ <id>0</id>
+ <mode>spinlist</mode>
+ <width>260</width>
+ <height>45</height>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>24</spinWidth>
+ <spinHeight>24</spinHeight>
+ <spinXOff>13</spinXOff>
+ <spinTextXOff>7</spinTextXOff>
+ <spinTextYOff>2</spinTextYOff>
+ <spinalign>right</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <showrange>no</showrange>
+ <reverse>no</reverse>
+ <cycleItems>yes</cycleItems>
+ <dialogTitle></dialogTitle>
+ <dialogShowNumbers>no</dialogShowNumbers>
+ <font>font12</font>
+ <textcolor>ffa9d0f7</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ <disabledcolor>ff808080</disabledcolor>
+ <textcolorNoFocus>ffa9d0f7</textcolorNoFocus>
+ <dimColor>ff000000</dimColor>
+ <shadowAngle>45</shadowAngle>
+ <shadowDistance>3</shadowDistance>
+ <shadowColor>ff000000</shadowColor>
+ <textXOff>17</textXOff>
+ <textYOff>6</textYOff>
+ <textureFocus>button_focus.png</textureFocus>
+ <textureNoFocus>button_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="105,105" time="50">focus</animation>
+ <animation effect="zoom" start="105,105" end="100,100" time="0">unfocus</animation>
+ </control>
+ <control>
<description>default updownbutton</description>
<type>updownbutton</type>
<id>0</id>
Modified: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/settings.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/settings.xml 2011-04-22 13:07:25 UTC (rev 27826)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/settings.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -75,6 +75,14 @@
<hyperlink>14</hyperlink>
</control>
<control>
+ <description>Weather</description>
+ <type>button</type>
+ <id>12</id>
+ <width>350</width>
+ <label>8</label>
+ <hyperlink>17</hyperlink>
+ </control>
+ <control>
<description>MiniDisplay</description>
<type>button</type>
<id>11</id>
Added: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/settings_weather.xml
===================================================================
--- branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/settings_weather.xml (rev 0)
+++ branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/settings_weather.xml 2011-04-22 20:08:05 UTC (rev 27827)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<window>
+ <id>17</id>
+ <defaultcontrol>21</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.label:400</define>
+ <define>#header.image:settings_logo.png</define>
+ <define>#header.hover:hover_my weather.png</define>
+ <controls>
+ <import>common.settings.xml</import>
+ <control>
+ <description>buttons</description>
+ <type>group</type>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="150" start="800,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="800,0">WindowClose</animation>
+ <posX>240</posX>
+ <posY>188</posY>
+ <layout>StackLayout(6)</layout>
+ <control>
+ <description>Add Location</description>
+ <type>button</type>
+ <id>21</id>
+ <width>800</width>
+ <height>40</height>
+ <label>1650</label>
+ <onup>17</onup>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="102,102" time="100">focus</animation>
+ <animation effect="zoom" start="102,102" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>Remove Location</description>
+ <type>button</type>
+ <id>22</id>
+ <width>800</width>
+ <height>40</height>
+ <label>1651</label>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="102,102" time="100">focus</animation>
+ <animation effect="zoom" start="102,102" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>Default Location</description>
+ <type>menubutton</type>
+ <id>23</id>
+ <width>800</width>
+ <height>40</height>
+ <label>1652</label>
+ <mode>dialoglist</mode>
+ <dialogTitle>1652</dialogTitle>
+ <dialogShowNumbers>no</dialogShowNumbers>
+ <valueTextInButton align="right">yes</valueTextInButton>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="102,102" time="100">focus</animation>
+ <animation effect="zoom" start="102,102" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>Temperature Units</description>
+ <type>menubutton</type>
+ <id>24</id>
+ <width>800</width>
+ <height>40</height>
+ <label>1653</label>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="102,102" time="100">focus</animation>
+ <animation effect="zoom" start="102,102" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>Wind Speed Units</description>
+ <type>menubutton</type>
+ <id>25</id>
+ <width>800</width>
+ <height>40</height>
+ <label>1654</label>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="102,102" time="100">focus</animation>
+ <animation effect="zoom" start="102,102" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>Refresh Interval</description>
+ <type>menubutton</type>
+ <id>26</id>
+ <width>800</width>
+ <height>40</height>
+ <label>1655</label>
+ <spintype>int</spintype>
+ <valueSuffixText>1656</valueSuffixText>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <animation effect="zoom" start="100,100" end="102,102" time="100">focus</animation>
+ <animation effect="zoom" start="102,102" end="100,100" time="300">unfocus</animation>
+ </control>
+ </control>
+ </controls>
+</window>
\ No newline at end of file
|
|
From: <Jameson_uk@su...> - 2011-04-22 13:07:32
|
Author: Jameson_uk
Date: 2011-04-22 15:07:25 +0200 (Fri, 22 Apr 2011)
New Revision: 27826
Modified:
trunk/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh
Log:
Missed bumping this to 1.1.7.0
Modified: trunk/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh
===================================================================
--- trunk/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh 2011-04-22 11:11:45 UTC (rev 27825)
+++ trunk/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh 2011-04-22 13:07:25 UTC (rev 27826)
@@ -32,7 +32,7 @@
!define VER_MAJOR 1
!define VER_MINOR 1
-!define VER_REVISION 6
+!define VER_REVISION 7
!ifndef VER_BUILD
!define VER_BUILD 0
!endif
|
|
From: <flokel@su...> - 2011-04-22 11:11:53
|
Author: flokel Date: 2011-04-22 13:11:45 +0200 (Fri, 22 Apr 2011) New Revision: 27825 Added: trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml Log: added frequencies for Portugal.All Regions Added: trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml =================================================================== --- trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml (rev 0) +++ trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml 2011-04-22 11:11:45 UTC (rev 27825) @@ -0,0 +1,248 @@ +<?xml version="1.0" encoding="utf-8"?> +<ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema">; + <DVBTTuning> + <Frequency>474000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>482000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>490000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>498000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>506000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>514000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>522000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>530000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>538000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>546000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>554000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>562000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>570000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>578000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>586000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>594000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>602000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>610000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>618000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>626000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>634000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>642000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>650000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>658000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>666000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>674000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>682000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>690000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>698000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>706000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>714000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>722000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>730000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>738000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>746000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>754000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>762000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>777000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>778000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>786000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>794000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>802000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>810000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>818000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>826000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>834000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>842000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>850000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> + <DVBTTuning> + <Frequency>858000</Frequency> + <BandWidth>8</BandWidth> + <Offset>125</Offset> + </DVBTTuning> +</ArrayOfDVBTTuning> \ No newline at end of file |
|
From: <flokel@su...> - 2011-04-22 11:08:59
|
Author: flokel
Date: 2011-04-22 13:08:51 +0200 (Fri, 22 Apr 2011)
New Revision: 27824
Modified:
trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sandy Heath.xml
Log:
updated frequencies for UK.Sandy Health
Modified: trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sandy Heath.xml
===================================================================
--- trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sandy Heath.xml 2011-04-22 02:24:20 UTC (rev 27823)
+++ trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sandy Heath.xml 2011-04-22 11:08:51 UTC (rev 27824)
@@ -41,6 +41,11 @@
<Offset>167</Offset>
</DVBTTuning>
<DVBTTuning>
+ <Frequency>706000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
<Frequency>714000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
@@ -50,4 +55,34 @@
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
+ <DVBTTuning>
+ <Frequency>730000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>746000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>762000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>778000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>785000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
+ <DVBTTuning>
+ <Frequency>842000</Frequency>
+ <BandWidth>8</BandWidth>
+ <Offset>167</Offset>
+ </DVBTTuning>
</ArrayOfDVBTTuning>
\ No newline at end of file
|
Author: ajp5199
Date: 2011-04-22 04:24:20 +0200 (Fri, 22 Apr 2011)
New Revision: 27823
Added:
branches/ajp8164_13/Build/VS_Rebuild_Debug_Corecpp.bat
branches/ajp8164_13/Build/VS_Rebuild_Debug_DirectShowFilters.bat
branches/ajp8164_13/Build/VS_Rebuild_Debug_MPC_HC_subs.bat
branches/ajp8164_13/Build/VS_Rebuild_Debug_Win7RefreshRateHelper.bat
branches/ajp8164_13/Build/VS_Rebuild_Release_Corecpp.bat
branches/ajp8164_13/Build/VS_Rebuild_Release_DirectShowFilters.bat
branches/ajp8164_13/Build/VS_Rebuild_Release_MPC_HC_subs.bat
branches/ajp8164_13/Build/VS_Rebuild_Release_Win7RefreshRateHelper.bat
Removed:
branches/ajp8164_13/Build/VS2008_Rebuild_Debug_Corecpp.bat
branches/ajp8164_13/Build/VS2008_Rebuild_Debug_DirectShowFilters.bat
branches/ajp8164_13/Build/VS2008_Rebuild_Debug_MPC_HC_subs.bat
branches/ajp8164_13/Build/VS2008_Rebuild_Debug_Win7RefreshRateHelper.bat
branches/ajp8164_13/Build/VS2008_Rebuild_Release_Corecpp.bat
branches/ajp8164_13/Build/VS2008_Rebuild_Release_DirectShowFilters.bat
branches/ajp8164_13/Build/VS2008_Rebuild_Release_MPC_HC_subs.bat
branches/ajp8164_13/Build/VS2008_Rebuild_Release_Win7RefreshRateHelper.bat
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/Lock.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/UserRatingStarOff.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/UserRatingStarOn.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/background_tvseries.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/defaultActor.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/filmstrip_overlay.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/mainoverlay.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/overlaywubg.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/star0.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/star1.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/star10.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/star2.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/star3.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/star4.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/star5.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/star6.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/star7.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/star8.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/star9.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/thumbborder.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvseries_SeasonListIcon.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvseries_SeriesListIcon.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvseries_UnWatched.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvseries_UnWatchedNA.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvseries_Watched.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvseries_WatchedNA.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvseries_defaultEpThumb.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/Media/tvseries_newlabel.png
Modified:
branches/ajp8164_13/
branches/ajp8164_13/Build/BuildInit.bat
branches/ajp8164_13/Common-MP-TVE3/SolutionInfo.cs
branches/ajp8164_13/DirectShowFilters/MPWriter/MPWriter.vcxproj
branches/ajp8164_13/DirectShowFilters/MPWriter/bin/Debug/MPFileWriter.ax
branches/ajp8164_13/DirectShowFilters/MPWriter/bin/Debug/MPFileWriter.pdb
branches/ajp8164_13/DirectShowFilters/MPWriter/bin/Debug/vc100.pdb
branches/ajp8164_13/DirectShowFilters/MPWriter/bin/Release/MPFileWriter.ax
branches/ajp8164_13/DirectShowFilters/MPWriter/source/ChannelScan.cpp
branches/ajp8164_13/DirectShowFilters/MPWriter/source/FileSinkRecorder.cpp
branches/ajp8164_13/DirectShowFilters/MPWriter/source/FileSinkRecorder.h
branches/ajp8164_13/DirectShowFilters/MPWriter/source/FileWriter.cpp
branches/ajp8164_13/DirectShowFilters/MPWriter/source/MPFileWriter.cpp
branches/ajp8164_13/DirectShowFilters/MPWriter/source/MPFileWriter.h
branches/ajp8164_13/DirectShowFilters/MPWriter/source/MultiFileWriter.cpp
branches/ajp8164_13/DirectShowFilters/MPWriter/source/MultiWriterFileSink.cpp
branches/ajp8164_13/DirectShowFilters/MPWriter/source/MultiWriterFileSink.h
branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStream.cpp
branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStream.h
branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStreamRecorder.cpp
branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStreamRecorder.h
branches/ajp8164_13/DirectShowFilters/MPWriter/source/SubChannel.cpp
branches/ajp8164_13/DirectShowFilters/MPWriter/source/SubChannel.h
branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/FileReader.cpp
branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/MultiFileReader.cpp
branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsMPEG2TransportFileServerMediaSubsession.cpp
branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsMPEG2TransportFileServerMediaSubsession.h
branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsStreamFileSource.cpp
branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsStreamFileSource.h
branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/main.cpp
branches/ajp8164_13/DirectShowFilters/StreamingServer/StreamingServer.vcxproj
branches/ajp8164_13/DirectShowFilters/StreamingServer/bin/Debug/StreamingServer.dll
branches/ajp8164_13/DirectShowFilters/StreamingServer/bin/Debug/StreamingServer.pdb
branches/ajp8164_13/DirectShowFilters/StreamingServer/bin/Debug/vc100.pdb
branches/ajp8164_13/DirectShowFilters/StreamingServer/bin/Release/StreamingServer.dll
branches/ajp8164_13/DirectShowFilters/TsReader/bin/Debug/TsReader.ax
branches/ajp8164_13/DirectShowFilters/TsReader/bin/Debug/TsReader.pdb
branches/ajp8164_13/DirectShowFilters/TsReader/bin/Release/TsReader.ax
branches/ajp8164_13/DirectShowFilters/TsReader/source/MultiFileReader.cpp
branches/ajp8164_13/DirectShowFilters/TsWriter/bin/Debug/TsWriter.ax
branches/ajp8164_13/DirectShowFilters/TsWriter/bin/Debug/TsWriter.pdb
branches/ajp8164_13/DirectShowFilters/TsWriter/bin/Debug/vc100.pdb
branches/ajp8164_13/DirectShowFilters/TsWriter/bin/Release/TsWriter.ax
branches/ajp8164_13/DirectShowFilters/TsWriter/source/DiskRecorder.cpp
branches/ajp8164_13/DirectShowFilters/TsWriter/source/DiskRecorder.h
branches/ajp8164_13/DirectShowFilters/TsWriter/source/FileWriter.cpp
branches/ajp8164_13/DirectShowFilters/TsWriter/source/MultiFileWriter.cpp
branches/ajp8164_13/DirectShowFilters/TsWriter/source/TsWriter.cpp
branches/ajp8164_13/DirectShowFilters/TsWriter/source/TsWriter.h
branches/ajp8164_13/Tools/InstallationScripts/DeployToolUnPacker.nsi
branches/ajp8164_13/Tools/LogoAutoRenamer/LogoAutoRenamer.csproj
branches/ajp8164_13/Tools/LogoAutoRenamer/LogoAutoRenamer.sln
branches/ajp8164_13/Tools/LogoAutoRenamer/MainForm.cs
branches/ajp8164_13/Tools/LogoAutoRenamer/Properties/Resources.Designer.cs
branches/ajp8164_13/Tools/LogoAutoRenamer/Properties/Settings.Designer.cs
branches/ajp8164_13/Tools/LogoAutoRenamer/bin/Release/LogoAutoRenamer.exe
branches/ajp8164_13/Tools/MediaPortal.DeployTool/Utils.cs
branches/ajp8164_13/TvEngine3/TVLibrary/Setup/setup.nsi
branches/ajp8164_13/TvEngine3/TVLibrary/SetupTv/57_upgrade_mysql_database.sql
branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Graphs/Analog/AnalogSubChannel.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Graphs/HDPVR/HDPVRChannel.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Graphs/HDPVR/TVCardHDPVR.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/BaseSubChannel.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/DvbBaseScanning.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvCardDvbBase.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvDvbChannel.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/TvCardCollection.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/IMPRecord.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/ITsFilter.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/ITsRecorder.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/ItsTimeshift.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Streaming/RtspStreaming.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem G?\195?\182teborg.xml
branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sandy Heath.xml
branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVConflictDialog.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVHome.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVNotifyYesNoDialog.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVProgramDescription.cs
branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvSetup.cs
branches/ajp8164_13/mediaportal/Configuration/MediaPortal.Configuration.csproj
branches/ajp8164_13/mediaportal/Configuration/Resources/remote.Mce2004.png
branches/ajp8164_13/mediaportal/Configuration/Resources/remote.Mce2005TT.png
branches/ajp8164_13/mediaportal/Configuration/Sections/Gui.cs
branches/ajp8164_13/mediaportal/Configuration/Sections/GuiLanguage.cs
branches/ajp8164_13/mediaportal/Configuration/SettingsForm.cs
branches/ajp8164_13/mediaportal/Configuration/SettingsUpgradeManager.cs
branches/ajp8164_13/mediaportal/Core.cpp/mpc-hc_subs/src/dsutil/DSUtil.vcxproj
branches/ajp8164_13/mediaportal/Core/MusicPlayer/BASS/BassAudio.cs
branches/ajp8164_13/mediaportal/Core/Player/PlayerFactory.cs
branches/ajp8164_13/mediaportal/Core/Util/Util.cs
branches/ajp8164_13/mediaportal/Core/guilib/GUIControlFactory.cs
branches/ajp8164_13/mediaportal/Core/guilib/GUITextScrollUpControl.cs
branches/ajp8164_13/mediaportal/Core/guilib/PluginManager.cs
branches/ajp8164_13/mediaportal/MediaPortal.Application/FullScreenSplashScreen.cs
branches/ajp8164_13/mediaportal/MediaPortal.Application/MediaPortal.cs
branches/ajp8164_13/mediaportal/MediaPortal.Application/d3dapp.cs
branches/ajp8164_13/mediaportal/MediaPortal.Base/defaults/MusicViews.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/language/strings_cs.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/language/strings_en.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/language/strings_it.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/language/strings_nl.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/language/strings_no.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/language/strings_sv.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/language/strings_tr.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3/
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3/Media/hover_LastFmRadio.png
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3wide/
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/BasicHome.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/BasicHomeExtraInfos.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/musicOverlay.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/myradiorecorded.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Default/mytvrecordedtv.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHome.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHomeExtraInfos.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/musicOverlay.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/myradiorecorded.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/mytvrecordedtv.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/videoOverlay.xml
branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/DefaultWide/videoOverlayTop.xml
branches/ajp8164_13/mediaportal/MediaPortal.Tests/Core/guilib/TestData/MediaPortal.xml
branches/ajp8164_13/mediaportal/MiniDisplayLibrary/
branches/ajp8164_13/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd.gif
branches/ajp8164_13/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd_deactivated.gif
branches/ajp8164_13/mediaportal/Setup/setup.nsi
branches/ajp8164_13/mediaportal/Utils/Configuration/Config.cs
branches/ajp8164_13/mediaportal/WatchDog/MPWatchDog.cs
branches/ajp8164_13/mediaportal/WindowPlugins/GUISettings/General/GUISettingsGeneral.cs
Log:
Update with merges from trunk.
/usr/share/subversion/hook-scripts/commit-email.pl: `/usr/bin/svnlook diff /var/svnroot/public -r 27823' failed with this output:
Property changes on: branches/ajp8164_13
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:27133-27781
+ /trunk:27133-27822
Modified: branches/ajp8164_13/Build/BuildInit.bat
===================================================================
--- branches/ajp8164_13/Build/BuildInit.bat 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Build/BuildInit.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -14,6 +14,8 @@
set progpath=%ProgramFiles%
if not "%ProgramFiles(x86)%".=="". set progpath=%ProgramFiles(x86)%
+REM Select Visual Studio version
+set vsver=10.0
REM set other MP related paths
set SVN_ROOT=..
@@ -26,7 +28,7 @@
REM set log file
-set log=%project%.log
+set log=%project%_%BUILD_TYPE%.log
REM init log file, write dev env...
Deleted: branches/ajp8164_13/Build/VS2008_Rebuild_Debug_Corecpp.bat
===================================================================
--- branches/ajp8164_13/Build/VS2008_Rebuild_Debug_Corecpp.bat 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Build/VS2008_Rebuild_Debug_Corecpp.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,3 +0,0 @@
-@... off
-
-call "VS2008_Rebuild_Release_Corecpp.bat" Debug
Deleted: branches/ajp8164_13/Build/VS2008_Rebuild_Debug_DirectShowFilters.bat
===================================================================
--- branches/ajp8164_13/Build/VS2008_Rebuild_Debug_DirectShowFilters.bat 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Build/VS2008_Rebuild_Debug_DirectShowFilters.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,3 +0,0 @@
-@... off
-
-call "VS2008_Rebuild_Release_DirectShowFilters.bat" Debug
Deleted: branches/ajp8164_13/Build/VS2008_Rebuild_Debug_MPC_HC_subs.bat
===================================================================
--- branches/ajp8164_13/Build/VS2008_Rebuild_Debug_MPC_HC_subs.bat 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Build/VS2008_Rebuild_Debug_MPC_HC_subs.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,3 +0,0 @@
-@... off
-
-call "VS2008_Rebuild_Release_MPC_HC_subs.bat" Debug
Deleted: branches/ajp8164_13/Build/VS2008_Rebuild_Debug_Win7RefreshRateHelper.bat
===================================================================
--- branches/ajp8164_13/Build/VS2008_Rebuild_Debug_Win7RefreshRateHelper.bat 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Build/VS2008_Rebuild_Debug_Win7RefreshRateHelper.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,3 +0,0 @@
-@... off
-
-call "VS2008_Rebuild_Release_Win7RefreshRateHelper.bat" Debug
Deleted: branches/ajp8164_13/Build/VS2008_Rebuild_Release_Corecpp.bat
===================================================================
--- branches/ajp8164_13/Build/VS2008_Rebuild_Release_Corecpp.bat 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Build/VS2008_Rebuild_Release_Corecpp.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,10 +0,0 @@
-@... OFF
-
-rem build init
-set project=Corecpp
-call BuildInit.bat %1
-
-rem build
-echo.
-echo Building %project%
-"%progpath%\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" "..\mediaportal\Core.cpp\Core.cpp.sln" /Rebuild "%BUILD_TYPE%" >> %log%
Deleted: branches/ajp8164_13/Build/VS2008_Rebuild_Release_DirectShowFilters.bat
===================================================================
--- branches/ajp8164_13/Build/VS2008_Rebuild_Release_DirectShowFilters.bat 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Build/VS2008_Rebuild_Release_DirectShowFilters.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,10 +0,0 @@
-@... OFF
-
-rem build init
-set project=DirectShowFilters
-call BuildInit.bat %1
-
-rem build
-echo.
-echo Building %project%
-"%progpath%\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" "..\DirectShowFilters\Filters.sln" /Rebuild "%BUILD_TYPE%" >> %log%
Deleted: branches/ajp8164_13/Build/VS2008_Rebuild_Release_MPC_HC_subs.bat
===================================================================
--- branches/ajp8164_13/Build/VS2008_Rebuild_Release_MPC_HC_subs.bat 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Build/VS2008_Rebuild_Release_MPC_HC_subs.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,10 +0,0 @@
-@... OFF
-
-rem build init
-set project=MPC_HC_subs
-call BuildInit.bat %1
-
-rem build
-echo.
-echo Building %project%
-"%progpath%\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" "..\mediaportal\Core.cpp\mpc-hc_subs.sln" /Rebuild "%BUILD_TYPE%" >> %log%
Deleted: branches/ajp8164_13/Build/VS2008_Rebuild_Release_Win7RefreshRateHelper.bat
===================================================================
--- branches/ajp8164_13/Build/VS2008_Rebuild_Release_Win7RefreshRateHelper.bat 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Build/VS2008_Rebuild_Release_Win7RefreshRateHelper.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,10 +0,0 @@
-@... OFF
-
-rem build init
-set project=Win7RefreshRateHelper
-call BuildInit.bat %1
-
-rem build
-echo.
-echo Building %project%
-"%progpath%\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" "..\mediaportal\Core.cpp\Win7RefreshRateHelper\Win7RefreshRateHelper.sln" /Rebuild "%BUILD_TYPE%" >> %log%
Copied: branches/ajp8164_13/Build/VS_Rebuild_Debug_Corecpp.bat (from rev 27822, trunk/Build/VS_Rebuild_Debug_Corecpp.bat)
===================================================================
--- branches/ajp8164_13/Build/VS_Rebuild_Debug_Corecpp.bat (rev 0)
+++ branches/ajp8164_13/Build/VS_Rebuild_Debug_Corecpp.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -0,0 +1,3 @@
+@echo off
+
+call "VS_Rebuild_Release_Corecpp.bat" Debug
Copied: branches/ajp8164_13/Build/VS_Rebuild_Debug_DirectShowFilters.bat (from rev 27822, trunk/Build/VS_Rebuild_Debug_DirectShowFilters.bat)
===================================================================
--- branches/ajp8164_13/Build/VS_Rebuild_Debug_DirectShowFilters.bat (rev 0)
+++ branches/ajp8164_13/Build/VS_Rebuild_Debug_DirectShowFilters.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -0,0 +1,3 @@
+@echo off
+
+call "VS_Rebuild_Release_DirectShowFilters.bat" Debug
Copied: branches/ajp8164_13/Build/VS_Rebuild_Debug_MPC_HC_subs.bat (from rev 27822, trunk/Build/VS_Rebuild_Debug_MPC_HC_subs.bat)
===================================================================
--- branches/ajp8164_13/Build/VS_Rebuild_Debug_MPC_HC_subs.bat (rev 0)
+++ branches/ajp8164_13/Build/VS_Rebuild_Debug_MPC_HC_subs.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -0,0 +1,3 @@
+@echo off
+
+call "VS_Rebuild_Release_MPC_HC_subs.bat" Debug
Copied: branches/ajp8164_13/Build/VS_Rebuild_Debug_Win7RefreshRateHelper.bat (from rev 27822, trunk/Build/VS_Rebuild_Debug_Win7RefreshRateHelper.bat)
===================================================================
--- branches/ajp8164_13/Build/VS_Rebuild_Debug_Win7RefreshRateHelper.bat (rev 0)
+++ branches/ajp8164_13/Build/VS_Rebuild_Debug_Win7RefreshRateHelper.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -0,0 +1,3 @@
+@echo off
+
+call "VS_Rebuild_Release_Win7RefreshRateHelper.bat" Debug
Copied: branches/ajp8164_13/Build/VS_Rebuild_Release_Corecpp.bat (from rev 27822, trunk/Build/VS_Rebuild_Release_Corecpp.bat)
===================================================================
--- branches/ajp8164_13/Build/VS_Rebuild_Release_Corecpp.bat (rev 0)
+++ branches/ajp8164_13/Build/VS_Rebuild_Release_Corecpp.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -0,0 +1,10 @@
+@ECHO OFF
+
+rem build init
+set project=Corecpp
+call BuildInit.bat %1
+
+rem build
+echo.
+echo Building %project%
+"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\mediaportal\Core.cpp\Core.cpp.sln" /Rebuild "%BUILD_TYPE%" >> %log%
Copied: branches/ajp8164_13/Build/VS_Rebuild_Release_DirectShowFilters.bat (from rev 27822, trunk/Build/VS_Rebuild_Release_DirectShowFilters.bat)
===================================================================
--- branches/ajp8164_13/Build/VS_Rebuild_Release_DirectShowFilters.bat (rev 0)
+++ branches/ajp8164_13/Build/VS_Rebuild_Release_DirectShowFilters.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -0,0 +1,10 @@
+@ECHO OFF
+
+rem build init
+set project=DirectShowFilters
+call BuildInit.bat %1
+
+rem build
+echo.
+echo Building %project%
+"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\DirectShowFilters\Filters.sln" /Rebuild "%BUILD_TYPE%" >> %log%
Copied: branches/ajp8164_13/Build/VS_Rebuild_Release_MPC_HC_subs.bat (from rev 27822, trunk/Build/VS_Rebuild_Release_MPC_HC_subs.bat)
===================================================================
--- branches/ajp8164_13/Build/VS_Rebuild_Release_MPC_HC_subs.bat (rev 0)
+++ branches/ajp8164_13/Build/VS_Rebuild_Release_MPC_HC_subs.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -0,0 +1,10 @@
+@ECHO OFF
+
+rem build init
+set project=MPC_HC_subs
+call BuildInit.bat %1
+
+rem build
+echo.
+echo Building %project%
+"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\mediaportal\Core.cpp\mpc-hc_subs.sln" /Rebuild "%BUILD_TYPE%" >> %log%
Copied: branches/ajp8164_13/Build/VS_Rebuild_Release_Win7RefreshRateHelper.bat (from rev 27822, trunk/Build/VS_Rebuild_Release_Win7RefreshRateHelper.bat)
===================================================================
--- branches/ajp8164_13/Build/VS_Rebuild_Release_Win7RefreshRateHelper.bat (rev 0)
+++ branches/ajp8164_13/Build/VS_Rebuild_Release_Win7RefreshRateHelper.bat 2011-04-22 02:24:20 UTC (rev 27823)
@@ -0,0 +1,10 @@
+@ECHO OFF
+
+rem build init
+set project=Win7RefreshRateHelper
+call BuildInit.bat %1
+
+rem build
+echo.
+echo Building %project%
+"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\mediaportal\Core.cpp\Win7RefreshRateHelper\Win7RefreshRateHelper.sln" /Rebuild "%BUILD_TYPE%" >> %log%
Modified: branches/ajp8164_13/Common-MP-TVE3/SolutionInfo.cs
===================================================================
--- branches/ajp8164_13/Common-MP-TVE3/SolutionInfo.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Common-MP-TVE3/SolutionInfo.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -51,7 +51,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.6.0")]
-[assembly: AssemblyFileVersion("1.1.6.0")]
+[assembly: AssemblyVersion("1.1.7.0")]
+[assembly: AssemblyFileVersion("1.1.7.0")]
-//[assembly: CompatibleVersion("1.1.6.*", "1.1.6.*")]
+//[assembly: CompatibleVersion("1.1.7.*", "1.1.7.*")]
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/MPWriter.vcxproj
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/MPWriter.vcxproj 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/MPWriter.vcxproj 2011-04-22 02:24:20 UTC (rev 27823)
@@ -115,7 +115,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(DSHOW_BASE);$(WINDOWS_SDK)Include\;$(DXSDK_DIR)Include;../LiveMedia555/BasicUsageEnvironment/include;../LiveMedia555/groupsock/include;../LiveMedia555/liveMedia;../LiveMedia555/liveMedia/include;../LiveMedia555/UsageEnvironment/include;../LiveMedia555/MediaPortal;../streamingserver/Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DBG=1;DEBUG;_DEBUG;INC_OLE2;STRICT;_WIN32_WINNT=0x0400;WIN32;_WIN32;_MT;_DLL;_X86_=1;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>DBG=1;DEBUG;_DEBUG;INC_OLE2;STRICT;WIN32;_WIN32;_MT;_DLL;_X86_=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeaderOutputFile>.\obj\Debug/FileWriter.pch</PrecompiledHeaderOutputFile>
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/bin/Debug/MPFileWriter.ax
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/bin/Debug/MPFileWriter.pdb
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/bin/Debug/vc100.pdb
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/bin/Release/MPFileWriter.ax
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/ChannelScan.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/ChannelScan.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/ChannelScan.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -22,7 +22,8 @@
#include "TeletextGrabber.h"
#include "Hamming.h"
-extern void LogDebug(const char *fmt, ...) ;
+extern void LogDebug(const char *fmt, ...);
+extern void LogDebug(const wchar_t *fmt, ...);
CChannelScan::CChannelScan(LPUNKNOWN pUnk, HRESULT *phr )
:CUnknown( NAME ("MPFileWriterChannelScan"), pUnk)
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/FileSinkRecorder.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/FileSinkRecorder.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/FileSinkRecorder.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -9,6 +9,8 @@
////////// CFileSinkRecorder //////////
extern void LogDebug(const char *fmt, ...) ;
+extern void LogDebug(const wchar_t *fmt, ...);
+
CFileSinkRecorder::CFileSinkRecorder(UsageEnvironment& env, FileWriter* fid, unsigned bufferSize,char const* perFrameFileNamePrefix)
: MediaSink(env), fOutFid(fid), fBufferSize(bufferSize)
{
@@ -37,18 +39,16 @@
}
-CFileSinkRecorder* CFileSinkRecorder::createNew(UsageEnvironment& env, char const* fileName,unsigned bufferSize)
+CFileSinkRecorder* CFileSinkRecorder::createNew(UsageEnvironment& env, wchar_t const* fileName,unsigned bufferSize)
{
do
{
- LogDebug("CFileSinkRecorder::create file:%s",fileName);
+ LogDebug(L"CFileSinkRecorder::create file:%s",fileName);
FileWriter* fid = new FileWriter();
- WCHAR wstrFileName[2048];
- MultiByteToWideChar(CP_ACP,0,fileName,-1,wstrFileName,1+strlen(fileName));
- fid->SetFileName(wstrFileName);
+ fid->SetFileName(fileName);
if (FAILED(fid->OpenFile()))
{
- LogDebug("CFileSinkRecorder::create file:%s failed",fileName);
+ LogDebug(L"CFileSinkRecorder::create file:%s failed", fileName);
delete fid;
return NULL;
}
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/FileSinkRecorder.h
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/FileSinkRecorder.h 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/FileSinkRecorder.h 2011-04-22 02:24:20 UTC (rev 27823)
@@ -14,14 +14,14 @@
class CFileSinkRecorder: public MediaSink,public CPacketSync
{
public:
- static CFileSinkRecorder* createNew(UsageEnvironment& env, char const* fileName,unsigned bufferSize = 20000);
+ static CFileSinkRecorder* createNew(UsageEnvironment& env, wchar_t const* fileName,unsigned bufferSize = 20000);
// "bufferSize" should be at least as large as the largest expected
// input frame.
-
+
virtual ~CFileSinkRecorder();
void addData(unsigned char* data, unsigned dataSize,struct timeval presentationTime);
// (Available in case a client wants to add extra data to the output file)
-
+
virtual void OnTsPacket(byte* tsPacket);
void ClearStreams();
protected:
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/FileWriter.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/FileWriter.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/FileWriter.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -84,10 +84,6 @@
//
HRESULT FileWriter::OpenFile()
{
- USES_CONVERSION;
-
- TCHAR *pFileName = NULL;
-
// Is the file already opened
if (m_hFile != INVALID_HANDLE_VALUE)
{
@@ -101,7 +97,7 @@
}
// See the the file is being read.
- m_hFile = CreateFile(W2T(m_pFileName), // The filename
+ m_hFile = CreateFileW(m_pFileName, // The filename
(DWORD) GENERIC_WRITE, // File access
(DWORD) NULL, // Share access
NULL, // Security
@@ -120,7 +116,7 @@
CloseHandle(m_hFile);
// Try to open the file
- m_hFile = CreateFile(W2T(m_pFileName), // The filename
+ m_hFile = CreateFileW(m_pFileName, // The filename
(DWORD) GENERIC_WRITE, // File access
(DWORD) FILE_SHARE_READ, // Share access
NULL, // Security
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/MPFileWriter.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/MPFileWriter.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/MPFileWriter.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -81,35 +81,47 @@
};
static char logbuffer[2000];
-
-void LogDebug(const char *fmt, ...)
+static wchar_t logbufferw[2000];
+void LogDebug(const wchar_t *fmt, ...)
{
va_list ap;
va_start(ap,fmt);
- int tmp;
va_start(ap,fmt);
- tmp=vsprintf(logbuffer, fmt, ap);
+ vswprintf_s(logbufferw, fmt, ap);
va_end(ap);
- TCHAR folder[MAX_PATH];
- TCHAR fileName[MAX_PATH];
- ::SHGetSpecialFolderPath(NULL,folder,CSIDL_COMMON_APPDATA,FALSE);
- sprintf(fileName,"%s\\Team MediaPortal\\MediaPortal TV Server\\log\\MPFileWriter.Log",folder);
+ wchar_t folder[MAX_PATH];
+ wchar_t fileName[MAX_PATH];
+ ::SHGetSpecialFolderPathW(NULL, folder, CSIDL_COMMON_APPDATA, FALSE);
+ swprintf_s(fileName, L"%s\\Team MediaPortal\\MediaPortal TV Server\\log\\MPFileWriter.Log", folder);
- FILE* fp = fopen(fileName,"a+");
+ FILE* fp = _wfopen(fileName,L"a+, ccs=UTF-8");
if (fp!=NULL)
{
- SYSTEMTIME systemTime;
- GetLocalTime(&systemTime);
- fprintf(fp,"%02.2d-%02.2d-%04.4d %02.2d:%02.2d:%02.2d.%02.2d %s\n",
+ SYSTEMTIME systemTime;
+ GetLocalTime(&systemTime);
+ fwprintf(fp,L"%02.2d-%02.2d-%04.4d %02.2d:%02.2d:%02.2d.%02.2d %s\n",
systemTime.wDay, systemTime.wMonth, systemTime.wYear,
systemTime.wHour,systemTime.wMinute,systemTime.wSecond,systemTime.wMilliseconds,
- logbuffer);
+ logbufferw);
fclose(fp);
}
};
+void LogDebug(const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap,fmt);
+
+ va_start(ap,fmt);
+ vsprintf(logbuffer, fmt, ap);
+ va_end(ap);
+
+ MultiByteToWideChar(CP_ACP, 0, logbuffer, -1,logbufferw, sizeof(logbuffer)/sizeof(wchar_t));
+ LogDebug(L"%s", logbufferw);
+};
+
//
// Object creation stuff
//
@@ -551,11 +563,11 @@
return DllEntryPoint((HINSTANCE)(hModule), dwReason, lpReserved);
}
-STDMETHODIMP CMPFileWriter::SetTimeShiftFileName(int subChannelId, char* pszFileName)
+STDMETHODIMP CMPFileWriter::SetTimeShiftFileNameW(int subChannelId, wchar_t* pwszFileName)
{
CSubChannel* pSubChannel=GetSubChannel(subChannelId);
if (pSubChannel==NULL) return S_OK;
- return pSubChannel->SetTimeShiftFileName(pszFileName);
+ return pSubChannel->SetTimeShiftFileNameW(pwszFileName);
}
STDMETHODIMP CMPFileWriter::SetTimeShiftParams(int subChannelId, int minFiles, int maxFiles, ULONG maxFileSize)
@@ -586,11 +598,11 @@
}
-STDMETHODIMP CMPFileWriter::SetRecordingFileName(int subChannelId, char* pszFileName)
+STDMETHODIMP CMPFileWriter::SetRecordingFileNameW(int subChannelId, wchar_t* pwszFileName)
{
CSubChannel* pSubChannel=GetSubChannel(subChannelId);
if (pSubChannel==NULL) return S_OK;
- return pSubChannel->SetRecordingFileName(pszFileName);
+ return pSubChannel->SetRecordingFileNameW(pwszFileName);
}
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/MPFileWriter.h
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/MPFileWriter.h 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/MPFileWriter.h 2011-04-22 02:24:20 UTC (rev 27823)
@@ -40,12 +40,12 @@
DECLARE_INTERFACE_(IMPFileRecord, IUnknown)
{
- STDMETHOD(SetRecordingFileName)(THIS_ int subChannelId, char* pszFileName)PURE;
+ STDMETHOD(SetRecordingFileNameW)(THIS_ int subChannelId, wchar_t* pwszFileName)PURE;
STDMETHOD(StartRecord)(THIS_ int subChannelId)PURE;
STDMETHOD(StopRecord)(THIS_ int subChannelId)PURE;
STDMETHOD(IsReceiving)(THIS_ BOOL* yesNo)PURE;
STDMETHOD(Reset)(THIS_)PURE;
- STDMETHOD(SetTimeShiftFileName)(THIS_ int subChannelId, char* pszFileName)PURE;
+ STDMETHOD(SetTimeShiftFileNameW)(THIS_ int subChannelId, wchar_t* pwszFileName)PURE;
STDMETHOD(StartTimeShifting)(THIS_ int subChannelId)PURE;
STDMETHOD(StopTimeShifting)(THIS_ int subChannelId)PURE;
STDMETHOD(PauseTimeShifting)(THIS_ int subChannelId, int onOff)PURE;
@@ -140,14 +140,14 @@
HRESULT Write(PBYTE pbData, LONG lDataLength);
HRESULT WriteTeletext(PBYTE pbData, LONG lDataLength);
- STDMETHODIMP SetRecordingFileName(int subChannelId, char* pszFileName);
+ STDMETHODIMP SetRecordingFileNameW(int subChannelId, wchar_t* pwszFileName);
STDMETHODIMP StartRecord(int subChannelId);
STDMETHODIMP StopRecord(int subChannelId);
STDMETHODIMP IsReceiving(BOOL* yesNo);
STDMETHODIMP Reset();
- STDMETHODIMP SetTimeShiftFileName(int subChannelId, char* pszFileName);
+ STDMETHODIMP SetTimeShiftFileNameW(int subChannelId, wchar_t* pszFileName);
STDMETHODIMP StartTimeShifting(int subChannelId);
STDMETHODIMP StopTimeShifting(int subChannelId);
STDMETHODIMP PauseTimeShifting(int subChannelId, int onOff);
@@ -171,9 +171,6 @@
};
-
-
-
class CMPFileWriterTeletextInputPin : public CRenderedInputPin
{
CMPFileWriter* const m_pMPFileWriter; // Main renderer object
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/MultiFileWriter.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/MultiFileWriter.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/MultiFileWriter.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -35,6 +35,7 @@
#include <windows.h>
#include <stdio.h>
+extern void LogDebug(const wchar_t *fmt, ...);
extern void LogDebug(const char *fmt, ...) ;
MultiFileWriter::MultiFileWriter() :
@@ -293,7 +294,7 @@
HRESULT hr;
LPWSTR pFilename = new wchar_t[MAX_PATH];
- WIN32_FIND_DATA findData;
+ WIN32_FIND_DATAW findData;
HANDLE handleFound = INVALID_HANDLE_VALUE;
LogDebug("MultiFileWriter: CreateNewTSFile.");
@@ -304,7 +305,7 @@
swprintf(pFilename, L"%s%i.ts", m_pTSBufferFileName, m_currentFilenameId);
// Check if file already exists
- handleFound = FindFirstFile(W2T(pFilename), &findData);
+ handleFound = FindFirstFileW(pFilename, &findData);
if (handleFound == INVALID_HANDLE_VALUE)
break;
@@ -335,8 +336,8 @@
if (pos)
m_currentFileId = _wtoi(pos);
wchar_t msg[MAX_PATH];
- swprintf((LPWSTR)&msg, L"New file created : %s\n", pFilename);
- ::OutputDebugString(W2T((LPWSTR)&msg));
+ swprintf(msg, L"New file created : %s\n", pFilename);
+ ::OutputDebugStringW(msg);
LogDebug("MultiFileWriter: new file created");
return S_OK;
@@ -372,11 +373,11 @@
if (Tmo)
{
if (Tmo<4) // 1 failed + 1 succeded is quasi-normal, more is a bit suspicious ( disk drive too slow or problem ? )
- LogDebug("MultiFileWriter: %d tries to succeed deleting and re-opening %ws.", 6-Tmo, pFilename);
+ LogDebug(L"MultiFileWriter: %d tries to succeed deleting and re-opening %s.", 6-Tmo, pFilename);
}
else
{
- LogDebug("MultiFileWriter: failed to create file %ws",pFilename);
+ LogDebug(L"MultiFileWriter: failed to create file %s", pFilename);
return hr ;
}
@@ -391,8 +392,8 @@
if (pos)
m_currentFileId = _wtoi(pos);
wchar_t msg[MAX_PATH];
- swprintf((LPWSTR)&msg, L"Old file reused : %s\n", pFilename);
- ::OutputDebugString(W2T((LPWSTR)&msg));
+ swprintf(msg, L"Old file reused : %s\n", pFilename);
+ ::OutputDebugStringW(msg);
LogDebug("MultiFileWriter: reuse old file");
return S_OK;
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/MultiWriterFileSink.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/MultiWriterFileSink.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/MultiWriterFileSink.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -9,6 +9,8 @@
////////// CMultiWriterFileSink //////////
extern void LogDebug(const char *fmt, ...) ;
+extern void LogDebug(const wchar_t *fmt, ...);
+
CMultiWriterFileSink::CMultiWriterFileSink(UsageEnvironment& env, MultiFileWriter* fid, unsigned bufferSize,char const* perFrameFileNamePrefix)
: MediaSink(env), fOutFid(fid), fBufferSize(bufferSize)
{
@@ -64,21 +66,19 @@
delete[] m_pWriteBuffer;
}
-CMultiWriterFileSink* CMultiWriterFileSink::createNew(UsageEnvironment& env, char const* fileName,int minFiles, int maxFiles, ULONG maxFileSize,unsigned bufferSize, Boolean oneFilePerFrame, int channelType)
+CMultiWriterFileSink* CMultiWriterFileSink::createNew(UsageEnvironment& env, wchar_t const* fileName,int minFiles, int maxFiles, ULONG maxFileSize,unsigned bufferSize, Boolean oneFilePerFrame, int channelType)
{
do
{
- LogDebug("CMultiWriterFileSink::create file:%s",fileName);
+ LogDebug(L"CMultiWriterFileSink::create file:%s", fileName);
MultiFileWriter* fid = new MultiFileWriter();
fid->setMinTSFiles(minFiles);
fid->setMaxTSFiles(maxFiles);
fid->setChunkReserve(maxFileSize);
fid->setMaxTSFileSize(maxFileSize);
- WCHAR wstrFileName[2048];
- MultiByteToWideChar(CP_ACP,0,fileName,-1,wstrFileName,1+strlen(fileName));
- if (FAILED(fid->OpenFile(wstrFileName)))
+ if (FAILED(fid->OpenFile(fileName)))
{
- LogDebug("CMultiWriterFileSink::create file:%s failed",fileName);
+ LogDebug(L"CMultiWriterFileSink::create file:%s failed", fileName);
delete fid;
return NULL;
}
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/MultiWriterFileSink.h
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/MultiWriterFileSink.h 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/MultiWriterFileSink.h 2011-04-22 02:24:20 UTC (rev 27823)
@@ -28,7 +28,7 @@
class CMultiWriterFileSink: public MediaSink,public CPacketSync
{
public:
- static CMultiWriterFileSink* createNew(UsageEnvironment& env, char const* fileName,int minFiles, int maxFiles, ULONG maxFileSize,unsigned bufferSize = 20000,Boolean oneFilePerFrame = False, int channelType = 0);
+ static CMultiWriterFileSink* createNew(UsageEnvironment& env, wchar_t const* fileName,int minFiles, int maxFiles, ULONG maxFileSize,unsigned bufferSize = 20000,Boolean oneFilePerFrame = False, int channelType = 0);
// "bufferSize" should be at least as large as the largest expected
// input frame.
// "oneFilePerFrame" - if True - specifies that each input frame will
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStream.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStream.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStream.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -4,6 +4,7 @@
#include "ProgramToTransportStream.h"
#include "MemoryStreamSource.h"
extern void LogDebug(const char *fmt, ...) ;
+extern void LogDebug(const wchar_t *fmt, ...);
CProgramToTransportStream::CProgramToTransportStream(void)
{
@@ -27,9 +28,9 @@
LogDebug("CProgramToTransportStream afterPlaying");
MPEG2TransportStreamFromPESSource* outputSink=(MPEG2TransportStreamFromPESSource*)clientData;
}
-void CProgramToTransportStream::Initialize(char* fileNameOut)
+void CProgramToTransportStream::Initialize(wchar_t* fileNameOut)
{
- LogDebug("CProgramToTransportStream::Initialize %s",fileNameOut);
+ LogDebug(L"CProgramToTransportStream::Initialize %s", fileNameOut);
m_BufferThreadActive=false;
m_buffer.Clear();
@@ -50,7 +51,7 @@
// And, from this, a filter that converts to MPEG-2 Transport Stream frames:
m_tsFrames = MPEG2TransportStreamFromPESSource::createNew(*m_env, pesSource);
- m_outputSink = CMultiWriterFileSink::createNew(*m_env, fileNameOut,m_minFiles,m_maxFiles,m_maxFileSize);
+ m_outputSink = CMultiWriterFileSink::createNew(*m_env, fileNameOut, m_minFiles, m_maxFiles, m_maxFileSize);
if (m_outputSink == NULL)
{
*m_env << "Unable to open file \"" << fileNameOut << "\" as a file sink\n";
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStream.h
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStream.h 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStream.h 2011-04-22 02:24:20 UTC (rev 27823)
@@ -14,7 +14,7 @@
public:
CProgramToTransportStream(void);
virtual ~CProgramToTransportStream(void);
- void Initialize(char* fileNameOut);
+ void Initialize(wchar_t* fileNameOut);
void SetTimeShiftParams( int minFiles, int maxFiles, ULONG maxFileSize);
void SetChannelType(int channelType);
void ClearStreams();
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStreamRecorder.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStreamRecorder.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStreamRecorder.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -4,6 +4,7 @@
#include "ProgramToTransportStreamRecorder.h"
#include "MemoryStreamSource.h"
extern void LogDebug(const char *fmt, ...) ;
+extern void LogDebug(const wchar_t *fmt, ...) ;
CProgramToTransportStreamRecorder::CProgramToTransportStreamRecorder(void)
{
@@ -27,9 +28,9 @@
LogDebug("CProgramToTransportStreamRecorder afterPlaying");
MPEG2TransportStreamFromPESSource* outputSink=(MPEG2TransportStreamFromPESSource*)clientData;
}
-void CProgramToTransportStreamRecorder::Initialize(char* fileNameOut)
+void CProgramToTransportStreamRecorder::Initialize(wchar_t* fileNameOut)
{
- LogDebug("CProgramToTransportStreamRecorder::Initialize %s",fileNameOut);
+ LogDebug(L"CProgramToTransportStreamRecorder::Initialize %s", fileNameOut);
m_BufferThreadActive=false;
m_buffer.Clear();
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStreamRecorder.h
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStreamRecorder.h 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/ProgramToTransportStreamRecorder.h 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,6 +1,6 @@
#pragma once
-#include "livemedia.hh"
+#include "livemedia.hh"
#include "BasicUsageEnvironment.hh"
#include "MPTaskScheduler.h"
#include "MemoryBuffer.h"
@@ -14,7 +14,7 @@
public:
CProgramToTransportStreamRecorder(void);
virtual ~CProgramToTransportStreamRecorder(void);
- void Initialize(char* fileNameOut);
+ void Initialize(wchar_t* fileNameOut);
void ClearStreams();
void Close();
void Write(byte* data, int len);
@@ -26,7 +26,7 @@
bool m_BufferThreadActive;
void SetVideoAudioObserver(IAnalogVideoAudioObserver* callback);
-private:
+private:
UsageEnvironment* m_env;
CMemoryBuffer m_buffer;
CFileSinkRecorder* m_outputSink;
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/SubChannel.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/SubChannel.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/SubChannel.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -32,8 +32,8 @@
#include "SubChannel.h"
extern void LogDebug(const char *fmt, ...) ;
+extern void LogDebug(const wchar_t *fmt, ...);
-
CSubChannel::CSubChannel(LPUNKNOWN pUnk, HRESULT *phr, int id)
:CUnknown( NAME ("MPFileWriterSubChannel"), pUnk)
{
@@ -45,8 +45,8 @@
m_pTeletextGrabber = new CTeletextGrabber();
- strcpy(m_strRecordingFileName,"");
- strcpy(m_strTimeShiftFileName,"");
+ wcscpy(m_wstrRecordingFileName, L"");
+ wcscpy(m_wstrTimeShiftFileName, L"");
m_bIsTimeShifting=false;
m_bIsRecording=false;
}
@@ -88,10 +88,10 @@
}
-STDMETHODIMP CSubChannel::SetTimeShiftFileName(char* pszFileName)
+STDMETHODIMP CSubChannel::SetTimeShiftFileNameW(wchar_t* pwszFileName)
{
- strcpy(m_strTimeShiftFileName,pszFileName);
- strcat(m_strTimeShiftFileName,".tsbuffer");
+ wcscpy(m_wstrTimeShiftFileName, pwszFileName);
+ wcscat(m_wstrTimeShiftFileName, L".tsbuffer");
return S_OK;
}
@@ -112,21 +112,19 @@
if (m_bIsTimeShifting)
{
- LogDebug("CSubChannel::StartTimeShifting - (%d) - Stopping first - Filename:'%s'",m_id,m_strTimeShiftFileName);
+ LogDebug(L"CSubChannel::StartTimeShifting - (%d) - Stopping first - Filename:'%s'", m_id, m_wstrTimeShiftFileName);
m_pTsWriter->Close();
m_bIsTimeShifting=false;
}
- if (strlen(m_strTimeShiftFileName)==0) return E_FAIL;
+ if (wcslen(m_wstrTimeShiftFileName)==0) return E_FAIL;
- ::DeleteFile((LPCTSTR) m_strTimeShiftFileName);
- LogDebug("CSubChannel::StartTimeShifting() - (%d) - Filename:'%s'",m_id,m_strTimeShiftFileName);
+ ::DeleteFileW((LPCWSTR) m_wstrTimeShiftFileName);
+ LogDebug(L"CSubChannel::StartTimeShifting() - (%d) - Filename:'%s'",m_id,m_wstrTimeShiftFileName);
- m_pTsWriter->Initialize(m_strTimeShiftFileName);
+ m_pTsWriter->Initialize(m_wstrTimeShiftFileName);
m_bIsTimeShifting=true;
m_bPaused=false;
- WCHAR wstrFileName[2048];
- MultiByteToWideChar(CP_ACP,0,m_strTimeShiftFileName,-1,wstrFileName,1+strlen(m_strTimeShiftFileName));
m_pTeletextGrabber->Start();
return S_OK;
@@ -137,12 +135,12 @@
if (m_bIsTimeShifting)
{
- LogDebug("CSubChannel::StopTimeShifting() - (%d) - Filename:'%s'",m_id,m_strTimeShiftFileName);
+ LogDebug(L"CSubChannel::StopTimeShifting() - (%d) - Filename:'%s'",m_id,m_wstrTimeShiftFileName);
m_pTeletextGrabber->Stop();
m_pTsWriter->Close();
- strcpy(m_strTimeShiftFileName,"");
+ wcscpy(m_wstrTimeShiftFileName,L"");
m_bIsTimeShifting=false;
- ::DeleteFile((LPCTSTR) m_strTimeShiftFileName);
+ ::DeleteFileW((LPCWSTR) m_wstrTimeShiftFileName);
}
return S_OK;
}
@@ -166,12 +164,12 @@
return S_OK;
}
-STDMETHODIMP CSubChannel::SetRecordingFileName(char* pszFileName)
+STDMETHODIMP CSubChannel::SetRecordingFileNameW(wchar_t* pwszFileName)
{
if(m_bIsRecording){
return S_OK;
}
- strcpy(m_strRecordingFileName,pszFileName);
+ wcscpy(m_wstrRecordingFileName, pwszFileName);
return S_OK;
}
@@ -180,11 +178,11 @@
{
CAutoLock lock(&m_Lock);
StopRecord();
- if (strlen(m_strRecordingFileName)==0) return E_FAIL;
+ if (wcslen(m_wstrRecordingFileName)==0) return E_FAIL;
- ::DeleteFile((LPCTSTR) m_strRecordingFileName);
- LogDebug("CSubChannel::StartRecord() - (%d) - Filename:'%s'",m_id,m_strRecordingFileName);
- m_pTsRecorder->Initialize(m_strRecordingFileName);
+ ::DeleteFileW((LPCWSTR) m_wstrRecordingFileName);
+ LogDebug(L"CSubChannel::StartRecord() - (%d) - Filename:'%s'",m_id,m_wstrRecordingFileName);
+ m_pTsRecorder->Initialize(m_wstrRecordingFileName);
m_bIsRecording = true;
return S_OK;
@@ -196,9 +194,9 @@
return S_OK;
}
- LogDebug("CSubChannel::StopRecord() - (%d) - Filename:'%s'",m_id,m_strRecordingFileName);
+ LogDebug(L"CSubChannel::StopRecord() - (%d) - Filename:'%s'",m_id,m_wstrRecordingFileName);
m_pTsRecorder->Close();
- strcpy(m_strRecordingFileName,"");
+ wcscpy(m_wstrRecordingFileName, L"");
m_bIsRecording = false;
return S_OK;
}
Modified: branches/ajp8164_13/DirectShowFilters/MPWriter/source/SubChannel.h
===================================================================
--- branches/ajp8164_13/DirectShowFilters/MPWriter/source/SubChannel.h 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/MPWriter/source/SubChannel.h 2011-04-22 02:24:20 UTC (rev 27823)
@@ -34,11 +34,11 @@
HRESULT WriteTeletext(PBYTE pbData, LONG lDataLength);
int Handle() { return m_id;}
- STDMETHODIMP SetRecordingFileName(char* pszFileName);
+ STDMETHODIMP SetRecordingFileNameW(wchar_t* pwszFileName);
STDMETHODIMP StartRecord();
STDMETHODIMP StopRecord();
- STDMETHODIMP SetTimeShiftFileName(char* pszFileName);
+ STDMETHODIMP SetTimeShiftFileNameW(wchar_t* pwszFileName);
STDMETHODIMP SetChannelType(int channelType);
STDMETHODIMP StartTimeShifting();
STDMETHODIMP StopTimeShifting();
@@ -50,10 +50,10 @@
CProgramToTransportStreamRecorder* m_pTsRecorder;
- char m_strRecordingFileName[1024];
+ wchar_t m_wstrRecordingFileName[1024];
bool m_bIsRecording;
CProgramToTransportStream* m_pTsWriter;
- char m_strTimeShiftFileName[1024];
+ wchar_t m_wstrTimeShiftFileName[1024];
bool m_bIsTimeShifting;
bool m_bPaused;
CTeletextGrabber* m_pTeletextGrabber;
Modified: branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/FileReader.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/FileReader.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/FileReader.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -27,6 +27,8 @@
#include "FileReader.h"
//#include "global.h"
extern void LogDebug(const char *fmt, ...) ;
+extern void LogDebug(const wchar_t *fmt, ...) ;
+extern void LogDebug(const wchar_t *fmt, ...) ;
FileReader::FileReader() :
m_hFile(INVALID_HANDLE_VALUE),
m_pFileName(0),
@@ -158,12 +160,12 @@
if (Tmo)
{
if (Tmo<4) // 1 failed + 1 succeded is quasi-normal, more is a bit suspicious ( disk drive too slow or problem ? )
- LogDebug("FileReader::OpenFile(), %d tries to succeed opening %ws.", 6-Tmo, pFileName);
+ LogDebug(L"FileReader::OpenFile(), %d tries to succeed opening %s.", 6-Tmo, pFileName);
}
else
{
DWORD dwErr = GetLastError();
- LogDebug("FileReader::OpenFile(), open file %ws failed. Error code %d", pFileName, dwErr);
+ LogDebug(L"FileReader::OpenFile(), open file %s failed. Error code %d", pFileName, dwErr);
return HRESULT_FROM_WIN32(dwErr);
}
Modified: branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/MultiFileReader.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/MultiFileReader.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/MultiFileReader.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -31,6 +31,7 @@
#define MAX_BUFFER_TIMEOUT 1500
extern void LogDebug(const char *fmt, ...) ;
+extern void LogDebug(const wchar_t *fmt, ...) ;
MultiFileReader::MultiFileReader():
m_TSBufferFile(),
m_TSFile()
@@ -431,10 +432,9 @@
if (m_bDebugOutput)
{
- USES_CONVERSION;
- TCHAR sz[MAX_PATH+128];
- wsprintf(sz, TEXT("Removing file %s\n"), W2T(file->filename));
- ::OutputDebugString(sz);
+ wchar_t sz[MAX_PATH+128];
+ wsprintfW(sz, L"Removing file %s\n", file->filename);
+ ::OutputDebugStringW(sz);
}
delete file;
@@ -538,11 +538,10 @@
if (m_bDebugOutput)
{
- USES_CONVERSION;
- TCHAR sz[MAX_PATH+128];
+ wchar_t sz[MAX_PATH+128];
int nextStPos = (int)nextStartPosition;
- wsprintf(sz, TEXT("Adding file %s (%i)\n"), W2T(pFilename), nextStPos);
- ::OutputDebugString(sz);
+ wsprintfW(sz, L"Adding file %s (%i)\n", pFilename, nextStPos);
+ ::OutputDebugStringW(sz);
}
file = new MultiFileReaderFile();
@@ -598,8 +597,6 @@
HRESULT MultiFileReader::GetFileLength(LPWSTR pFilename, __int64 &length)
{
- USES_CONVERSION;
-
length = 0;
// Try to open the file
@@ -624,8 +621,8 @@
{
wchar_t msg[MAX_PATH];
DWORD dwErr = GetLastError();
- swprintf((LPWSTR)&msg, L"Failed to open file %s : 0x%x\n", pFilename, dwErr);
- ::OutputDebugString(W2T((LPWSTR)&msg));
+ swprintf(msg, MAX_PATH, L"Failed to open file %s : 0x%x\n", pFilename, dwErr);
+ ::OutputDebugStringW((LPWSTR)&msg);
return HRESULT_FROM_WIN32(dwErr);
}
return S_OK;
Modified: branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsMPEG2TransportFileServerMediaSubsession.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsMPEG2TransportFileServerMediaSubsession.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsMPEG2TransportFileServerMediaSubsession.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -8,15 +8,15 @@
extern void LogDebug(const char *fmt, ...) ;
-TsMPEG2TransportFileServerMediaSubsession* TsMPEG2TransportFileServerMediaSubsession::createNew(UsageEnvironment& env,char const* fileName,Boolean reuseFirstSource, Boolean timeshifting, int channelType)
+TsMPEG2TransportFileServerMediaSubsession* TsMPEG2TransportFileServerMediaSubsession::createNew(UsageEnvironment& env,wchar_t const* fileName,Boolean reuseFirstSource, Boolean timeshifting, int channelType)
{
- return new TsMPEG2TransportFileServerMediaSubsession(env, fileName, reuseFirstSource,timeshifting, channelType);
+ return new TsMPEG2TransportFileServerMediaSubsession(env, fileName, reuseFirstSource, timeshifting, channelType);
}
-TsMPEG2TransportFileServerMediaSubsession::TsMPEG2TransportFileServerMediaSubsession(UsageEnvironment& env,char const* fileName, Boolean reuseFirstSource, Boolean timeshifting, int channelType)
-: FileServerMediaSubsession(env, fileName, reuseFirstSource)
+TsMPEG2TransportFileServerMediaSubsession::TsMPEG2TransportFileServerMediaSubsession(UsageEnvironment& env,wchar_t const* fileName, Boolean reuseFirstSource, Boolean timeshifting, int channelType)
+: FileServerMediaSubsession(env, 0, reuseFirstSource)
{
- strcpy(m_fileName,fFileName);
+ wcscpy(m_fileName, fileName);
m_bTimeshifting = timeshifting;
m_iChannelType = channelType;
@@ -39,10 +39,9 @@
// Create the video source:
unsigned const inputDataChunkSize= TRANSPORT_PACKETS_PER_NETWORK_PACKET*TRANSPORT_PACKET_SIZE;
- TsStreamFileSource* fileSource= TsStreamFileSource::createNew(envir(), fFileName, inputDataChunkSize, 0, m_iChannelType);
+ TsStreamFileSource* fileSource= TsStreamFileSource::createNew(envir(), m_fileName, inputDataChunkSize, 0, m_iChannelType);
if (fileSource == NULL) return NULL;
fFileSize = fileSource->fileSize();
- strcpy(m_fileName,fFileName);
// Create a framer for the Transport Stream:
return TsMPEG2TransportStreamFramer::createNew(envir(), fileSource);
@@ -110,7 +109,7 @@
{
FileReader *pFileDuration;
- if (strstr(m_fileName,".tsbuffer")!=NULL)
+ if (wcsstr(m_fileName, L".tsbuffer")!=NULL)
{
pFileDuration = new MultiFileReader();
}
@@ -120,9 +119,7 @@
}
// initialize duration estimator
- WCHAR wFileName[1024];
- MultiByteToWideChar(CP_ACP,0,m_fileName,-1,wFileName,1024);
- pFileDuration->SetFileName(wFileName);
+ pFileDuration->SetFileName(m_fileName);
if(FAILED(pFileDuration->OpenFile()))
{
CloseFileDuration(pFileDuration);
Modified: branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsMPEG2TransportFileServerMediaSubsession.h
===================================================================
--- branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsMPEG2TransportFileServerMediaSubsession.h 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsMPEG2TransportFileServerMediaSubsession.h 2011-04-22 02:24:20 UTC (rev 27823)
@@ -9,11 +9,11 @@
class TsMPEG2TransportFileServerMediaSubsession: public FileServerMediaSubsession{
public:
static TsMPEG2TransportFileServerMediaSubsession*
- createNew(UsageEnvironment& env, char const* fileName, Boolean reuseFirstSource, Boolean timeshifting, int channelType);
+ createNew(UsageEnvironment& env, wchar_t const* fileName, Boolean reuseFirstSource, Boolean timeshifting, int channelType);
protected:
TsMPEG2TransportFileServerMediaSubsession(UsageEnvironment& env,
- char const* fileName,
+ wchar_t const* fileName,
Boolean reuseFirstSource, Boolean timeshifting, int channelType);
// called only by createNew();
virtual ~TsMPEG2TransportFileServerMediaSubsession();
@@ -31,7 +31,7 @@
virtual RTPSink* createNewRTPSink(Groupsock* rtpGroupsock,
unsigned char rtpPayloadTypeIfDynamic,
FramedSource* inputSource);
- char m_fileName[MAX_PATH];
+ wchar_t m_fileName[MAX_PATH];
Boolean m_bTimeshifting;
int m_iChannelType;
};
Modified: branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsStreamFileSource.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsStreamFileSource.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsStreamFileSource.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -32,16 +32,17 @@
#include "TsFileSeek.h"
extern void LogDebug(const char *fmt, ...) ;
+extern void LogDebug(const wchar_t *fmt, ...) ;
TsStreamFileSource*
-TsStreamFileSource::createNew(UsageEnvironment& env, char const* fileName,
+TsStreamFileSource::createNew(UsageEnvironment& env, wchar_t const* fileName,
unsigned preferredFrameSize,
unsigned playTimePerFrame, int channelType)
{
- LogDebug("ts:open %s",fileName);
+ LogDebug(L"ts:open %s", fileName);
FileReader* reader;
- if (strstr(fileName,".tsbuffer")!=NULL)
+ if (wcsstr(fileName, L".tsbuffer")!=NULL)
{
reader = new MultiFileReader();
__int64 fileSize= reader->GetFileSize();
@@ -50,9 +51,7 @@
{
reader = new FileReader();
}
- WCHAR wFileName[1024];
- MultiByteToWideChar(CP_ACP,0,fileName,-1,wFileName,1024);
- reader->SetFileName(wFileName);
+ reader->SetFileName(fileName);
reader->OpenFile();
Modified: branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsStreamFileSource.h
===================================================================
--- branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsStreamFileSource.h 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/TsStreamFileSource.h 2011-04-22 02:24:20 UTC (rev 27823)
@@ -33,7 +33,7 @@
class TsStreamFileSource: public FramedFileSource {
public:
static TsStreamFileSource* createNew(UsageEnvironment& env,
- char const* fileName,
+ wchar_t const* fileName,
unsigned preferredFrameSize = 0,
unsigned playTimePerFrame = 0,
int channelType = 0);
@@ -55,7 +55,7 @@
void seekToByteAbsolute(u_int64_t byteNumber);
void seekToByteRelative(int64_t offset);
- void seekToTimeAbsolute(CRefTime& seekTime, CTsDuration& duration);
+ void seekToTimeAbsolute(CRefTime& seekTime, CTsDuration& duration);
protected:
TsStreamFileSource(UsageEnvironment& env,
Modified: branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/main.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/main.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/StreamingServer/Source/main.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -13,37 +13,49 @@
//#include "RTSPOverHTTPServer.hh"
static char logbuffer[2000];
-
-void LogDebug(const char *fmt, ...)
+static wchar_t logbufferw[2000];
+void LogDebug(const wchar_t *fmt, ...)
{
va_list ap;
va_start(ap,fmt);
- int tmp;
va_start(ap,fmt);
- tmp=vsprintf(logbuffer, fmt, ap);
+ vswprintf_s(logbufferw, fmt, ap);
va_end(ap);
- TCHAR folder[MAX_PATH];
- TCHAR fileName[MAX_PATH];
- ::SHGetSpecialFolderPath(NULL,folder,CSIDL_COMMON_APPDATA,FALSE);
- sprintf(fileName,"%s\\Team MediaPortal\\MediaPortal TV Server\\log\\streaming server.Log",folder);
+ wchar_t folder[MAX_PATH];
+ wchar_t fileName[MAX_PATH];
+ ::SHGetSpecialFolderPathW(NULL, folder, CSIDL_COMMON_APPDATA, FALSE);
+ swprintf_s(fileName, L"%s\\Team MediaPortal\\MediaPortal TV Server\\log\\streaming server.Log", folder);
- FILE* fp = fopen(fileName,"a+");
+ FILE* fp = _wfopen(fileName,L"a+, ccs=UTF-8");
if (fp!=NULL)
{
SYSTEMTIME systemTime;
GetLocalTime(&systemTime);
- fprintf(fp,"%02.2d-%02.2d-%04.4d %02.2d:%02.2d:%02.2d.%02.2d %s\n",
+ fwprintf(fp,L"%02.2d-%02.2d-%04.4d %02.2d:%02.2d:%02.2d.%02.2d %s\n",
systemTime.wDay, systemTime.wMonth, systemTime.wYear,
systemTime.wHour,systemTime.wMinute,systemTime.wSecond,systemTime.wMilliseconds,
- logbuffer);
+ logbufferw);
fclose(fp);
}
};
+void LogDebug(const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap,fmt);
+
+ va_start(ap,fmt);
+ vsprintf(logbuffer, fmt, ap);
+ va_end(ap);
+
+ MultiByteToWideChar(CP_ACP, 0, logbuffer, -1, logbufferw, sizeof(logbuffer)/sizeof(wchar_t));
+ LogDebug(L"%s", logbufferw);
+};
+
const char* STREAM_NAME = "testStream";
-const char* STREAM_DESCRIPTION = "Session streamed by \"MediaPortal Tv Server v1.1 Beta 1\"";
+const char* STREAM_DESCRIPTION = "Session streamed by \"MediaPortal Tv Server v1.2 Beta 1\"";
const char* FILE_NAME = "C:\\temp\\testApp\\live.ts.tsbuffer";
const int DEFAULT_RTSP_PORT = 554;
@@ -54,9 +66,9 @@
int StreamSetupEx(char* ipAdress, int port);
void StreamShutdown();
void StreamRun();
-void announceStream(RTSPServer* rtspServer, ServerMediaSession* sms,char * streamName, char * inputFileName); // fwd
-void StreamAddTimeShiftFile(char* streamName, char* fileName,bool isProgramStream,int channelType);
-void StreamAddMpegFile(char* streamName, char* fileName, int channelType);
+void announceStream(RTSPServer* rtspServer, ServerMediaSession* sms, char * streamName, wchar_t * inputFileName); // fwd
+void StreamAddTimeShiftFile(char* streamName, wchar_t* fileName,bool isProgramStream,int channelType);
+void StreamAddMpegFile(char* streamName, wchar_t* fileName, int channelType);
void StreamRemove(char* streamName);
extern netAddressBits SendingInterfaceAddr ;
@@ -67,7 +79,7 @@
int main(int argc, char* argv[])
{
StreamSetup("192.168.1.130");
- StreamAddTimeShiftFile("test1", "C:\\1\\live5-0.ts.tsbuffer",false,0);
+ StreamAddTimeShiftFile("test1", L"C:\\1\\live5-0.ts.tsbuffer",false,0);
//StreamAddMpegFile("test2", "C:\\media\\movies\\NED 1.mpg");
//StreamAddMpegFile("test3", "C:\\media\\movies\\PREMIERE 420070201-1146.ts");
while (true)
@@ -125,13 +137,13 @@
//**************************************************************************************
int StreamSetupEx(char* ipAdress, int port)
{
- TCHAR folder[MAX_PATH];
- TCHAR fileName[MAX_PATH];
- ::SHGetSpecialFolderPath(NULL,folder,CSIDL_COMMON_APPDATA,FALSE);
- sprintf(fileName,"%s\\Team MediaPortal\\MediaPortal TV Server\\log\\streaming server.Log",folder);
- ::DeleteFile(fileName);
+ wchar_t folder[MAX_PATH];
+ wchar_t fileName[MAX_PATH];
+ ::SHGetSpecialFolderPathW(NULL,folder,CSIDL_COMMON_APPDATA,FALSE);
+ swprintf(fileName, MAX_PATH, L"%s\\Team MediaPortal\\MediaPortal TV Server\\log\\streaming server.Log", folder);
+ ::DeleteFileW(fileName);
- LogDebug("-------------- v1.0.4 ---------------");
+ LogDebug("-------------- v1.0.5 ---------------");
StreamShutdown();
if (port == DEFAULT_RTSP_PORT) {
LogDebug("Stream server:Setup stream server for ip: %s", ipAdress);
@@ -190,11 +202,11 @@
}
//**************************************************************************************
-void StreamAddTimeShiftFile(char* streamName, char* fileName,bool isProgramStream,int channelType)
+void StreamAddTimeShiftFile(char* streamName, wchar_t* fileName,bool isProgramStream,int channelType)
{
try
{
- LogDebug("Stream server: add timeshift mpeg-2 transport stream %s filename:%s", streamName,fileName);
+ LogDebug(L"Stream server: add timeshift mpeg-2 transport stream %S filename:%s", streamName,fileName);
ServerMediaSession* sms= ServerMediaSession::createNew(*m_env, streamName, streamName,STREAM_DESCRIPTION,false);
sms->addSubsession(TsMPEG2TransportFileServerMediaSubsession::createNew(*m_env, fileName, false,true,channelType));
m_rtspServer->addServerMediaSession(sms);
@@ -203,16 +215,16 @@
}
catch(...)
{
- LogDebug("Stream server: unable to add stream %s filename:%s", streamName,fileName);
+ LogDebug(L"Stream server: unable to add stream %S filename:%s", streamName,fileName);
}
}
//**************************************************************************************
-void StreamAddMpegFile(char* streamName, char* fileName, int channelType)
+void StreamAddMpegFile(char* streamName, wchar_t* fileName, int channelType)
{
try
{
- LogDebug("Stream server: add mpeg-2 ts stream %s filename:%s", streamName,fileName);
+ LogDebug(L"Stream server: add mpeg-2 ts stream %S filename:%s", streamName,fileName);
ServerMediaSession* sms= ServerMediaSession::createNew(*m_env, streamName, streamName,STREAM_DESCRIPTION,false);
sms->addSubsession(TsMPEG2TransportFileServerMediaSubsession::createNew(*m_env, fileName, false,false,channelType));
m_rtspServer->addServerMediaSession(sms);
@@ -220,12 +232,12 @@
}
catch(...)
{
- LogDebug("Stream server: unable to add stream %s filename:%s", streamName,fileName);
+ LogDebug(L"Stream server: unable to add stream %S filename:%s", streamName,fileName);
}
}
//**************************************************************************************
-void announceStream(RTSPServer* rtspServer, ServerMediaSession* sms,char * streamName, char * inputFileName)
+void announceStream(RTSPServer* rtspServer, ServerMediaSession* sms, char * streamName, wchar_t * inputFileName)
{
char* url = rtspServer->rtspURL(sms);
LogDebug("Stream server: url for stream is %s", url);
Modified: branches/ajp8164_13/DirectShowFilters/StreamingServer/StreamingServer.vcxproj
===================================================================
--- branches/ajp8164_13/DirectShowFilters/StreamingServer/StreamingServer.vcxproj 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/StreamingServer/StreamingServer.vcxproj 2011-04-22 02:24:20 UTC (rev 27823)
@@ -101,7 +101,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>DvbCoreUtils.lib;strmbase.lib;livemedia555.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>.\bin\Release\$(ProjectName).dll</OutputFile>
+ <OutputFile>bin\Release\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(DSHOW_BASE)Release_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib; ..\shared;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>Source\StreamingServer.def</ModuleDefinitionFile>
@@ -113,6 +113,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -138,7 +139,6 @@
<ClInclude Include="Source\TSThread.h" />
<ClInclude Include="Source\CriticalSection.h" />
<ClInclude Include="Source\EnterCriticalSection.h" />
- <ClInclude Include="Source\StdAfx.h" />
<ClInclude Include="Source\FileReader.h" />
<ClInclude Include="Source\MultiFileReader.h" />
<ClInclude Include="Source\Global.h" />
Modified: branches/ajp8164_13/DirectShowFilters/StreamingServer/bin/Debug/StreamingServer.dll
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/StreamingServer/bin/Debug/StreamingServer.pdb
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/StreamingServer/bin/Debug/vc100.pdb
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/StreamingServer/bin/Release/StreamingServer.dll
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/TsReader/bin/Debug/TsReader.ax
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/TsReader/bin/Debug/TsReader.pdb
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/TsReader/bin/Release/TsReader.ax
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/TsReader/source/MultiFileReader.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/TsReader/source/MultiFileReader.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/TsReader/source/MultiFileReader.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -212,9 +212,8 @@
if (m_bDebugOutput)
{
- USES_CONVERSION;
- TCHAR sz[MAX_PATH+128];
- wsprintf(sz, TEXT("Current File Changed to %s\n"), W2T(file->filename));
+ wchar_t sz[MAX_PATH+128];
+ wsprintfW(sz, L"Current File Changed to %s\n", file->filename);
//::OutputDebugString(sz);
}
}
@@ -431,10 +430,9 @@
if (m_bDebugOutput)
{
- USES_CONVERSION;
- TCHAR sz[MAX_PATH+128];
- wsprintf(sz, TEXT("Removing file %s\n"), W2T(file->filename));
- ::OutputDebugString(sz);
+ wchar_t sz[MAX_PATH+128];
+ wsprintfW(sz, L"Removing file %s\n", file->filename);
+ ::OutputDebugStringW(sz);
}
delete file;
@@ -538,11 +536,10 @@
if (m_bDebugOutput)
{
- USES_CONVERSION;
- TCHAR sz[MAX_PATH+128];
+ wchar_t sz[MAX_PATH+128];
int nextStPos = (int)nextStartPosition;
- wsprintf(sz, TEXT("Adding file %s (%i)\n"), W2T(pFilename), nextStPos);
- ::OutputDebugString(sz);
+ wsprintfW(sz, L"Adding file %s (%i)\n", pFilename, nextStPos);
+ ::OutputDebugStringW(sz);
}
file = new MultiFileReaderFile();
@@ -624,8 +621,8 @@
{
wchar_t msg[MAX_PATH];
DWORD dwErr = GetLastError();
- swprintf((LPWSTR)&msg, L"Failed to open file %s : 0x%x\n", pFilename, dwErr);
- ::OutputDebugString(W2T((LPWSTR)&msg));
+ swprintf(msg, MAX_PATH, L"Failed to open file %s : 0x%x\n", pFilename, dwErr);
+ ::OutputDebugStringW(msg);
return HRESULT_FROM_WIN32(dwErr);
}
return S_OK;
Modified: branches/ajp8164_13/DirectShowFilters/TsWriter/bin/Debug/TsWriter.ax
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/TsWriter/bin/Debug/TsWriter.pdb
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/TsWriter/bin/Debug/vc100.pdb
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/TsWriter/bin/Release/TsWriter.ax
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/DirectShowFilters/TsWriter/source/DiskRecorder.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/TsWriter/source/DiskRecorder.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/TsWriter/source/DiskRecorder.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -55,7 +55,7 @@
#define TRANSPORT_PRIVATE_DATA_FLAG_BIT 0x2 // bitmask for the TRANSPORT_PRIVATE_DATA flag
#define ADAPTION_FIELD_EXTENSION_FLAG_BIT 0x1 // bitmask for the DAPTION_FIELD_EXTENSION flag
-#define ERROR_FILE_TOO_LARGE 223
+//#define ERROR_FILE_TOO_LARGE 223 - already defined in winerror.h
#define RECORD_BUFFER_SIZE 256000
int DR_FAKE_NETWORK_ID = 0x456; // network id we use in our PAT
@@ -72,6 +72,7 @@
// this value a hole/jump is assumed
extern void LogDebug(const char *fmt, ...) ;
+extern void LogDebug(const wchar_t *fmt, ...) ;
//*******************************************************************
//* ctor
@@ -180,12 +181,11 @@
WriteLog("SetChannelType exception");
}
}
-void CDiskRecorder::SetFileName(char* pszFileName)
+void CDiskRecorder::SetFileNameW(wchar_t* pwszFileName)
{
CEnterCriticalSection enter(m_section);
try
{
- WriteLog("set filename:%s",pszFileName);
m_iPacketCounter=0;
m_iPmtPid=-1;
m_pcrPid=-1;
@@ -193,13 +193,14 @@
m_AudioOrVideoSeen=false ;
m_bStartPcrFound=false;
m_bDetermineNewStartPcr=false;
- strcpy(m_szFileName,pszFileName);
- if (m_recordingMode == TimeShift)
- strcat(m_szFileName,".tsbuffer");
+ wcscpy(m_wszFileName,pwszFileName);
+ if (m_recordingMode==RecordingMode::TimeShift)
+ wcscat(m_wszFileName, L".tsbuffer");
+ WriteLog(L"set filename:%s", m_wszFileName);
}
catch(...)
{
- WriteLog("SetFilename exception");
+ WriteLog(L"SetFilename exception");
}
}
@@ -215,17 +216,15 @@
return false;
}
- if (strlen(m_szFileName)==0) return false;
- ::DeleteFile((LPCTSTR) m_szFileName);
+ if (wcslen(m_wszFileName)==0) return false;
+ ::DeleteFileW((LPCWSTR) m_wszFileName);
m_iPart=2;
if (m_recordingMode==RecordingMode::TimeShift)
{
- WCHAR wstrFileName[2048];
- MultiByteToWideChar(CP_ACP,0,m_szFileName,-1,wstrFileName,1+strlen(m_szFileName));
m_pTimeShiftFile = new MultiFileWriter(&m_params);
- if (FAILED(m_pTimeShiftFile->OpenFile(wstrFileName)))
+ if (FAILED(m_pTimeShiftFile->OpenFile(m_wszFileName)))
{
- WriteLog("failed to open filename:%s %d",m_szFileName,GetLastError());
+ WriteLog(L"failed to open filename:%s %d",m_wszFileName,GetLastError());
m_pTimeShiftFile->CloseFile();
delete m_pTimeShiftFile;
m_pTimeShiftFile=NULL;
@@ -239,18 +238,18 @@
CloseHandle(m_hFile);
m_hFile=INVALID_HANDLE_VALUE;
}
- m_hFile = CreateFile(m_szFileName, // The filename
- (DWORD) GENERIC_WRITE, // File access
- (DWORD) FILE_SHARE_READ, // Share access
- NULL, // Security
- (DWORD) OPEN_ALWAYS, // Open flags
-// (DWORD) FILE_FLAG_RANDOM_ACCESS,
-// (DWORD) FILE_FLAG_WRITE_THROUGH, // More flags
- (DWORD) 0, // More flags
- NULL); // Template
+ m_hFile = CreateFileW( m_wszFileName, // The filename
+ (DWORD) GENERIC_WRITE, // File access
+ (DWORD) FILE_SHARE_READ, // Share access
+ NULL, // Security
+ (DWORD) OPEN_ALWAYS, // Open flags
+// (DWORD) FILE_FLAG_RANDOM_ACCESS,
+// (DWORD) FILE_FLAG_WRITE_THROUGH, // More flags
+ (DWORD) 0, // More flags
+ NULL); // Template
if (m_hFile == INVALID_HANDLE_VALUE)
{
- LogDebug("Recorder:unable to create file:'%s' %d",m_szFileName, GetLastError());
+ LogDebug(L"Recorder:unable to create file:'%s' %d",m_wszFileName, GetLastError());
return false;
}
}
@@ -262,7 +261,7 @@
m_mapLastPtsDts.clear();
m_iPacketCounter=0;
m_iWriteBufferPos=0;
- WriteLog("Start '%s'",m_szFileName);
+ WriteLog(L"Start '%s'",m_wszFileName);
m_bRunning=true;
m_bPaused=FALSE;
}
@@ -278,7 +277,7 @@
CEnterCriticalSection enter(m_section);
try
{
- WriteLog("Stop '%s'",m_szFileName);
+ WriteLog(L"Stop '%s'",m_wszFileName);
m_bRunning=false;
m_pPmtParser->Reset();
if (m_pTimeShiftFile!=NULL)
@@ -569,67 +568,66 @@
//On fat16/fat32 we can only create files of max. 2gb/4gb
if (ERROR_FILE_TOO_LARGE == GetLastError())
{
- LogDebug("Recorder:Maximum filesize reached for file:'%s' %d",m_szFileName);
+ LogDebug(L"Recorder:Maximum filesize reached for file:'%s' %d", m_wszFileName);
//close the file...
CloseHandle(m_hFile);
m_hFile=INVALID_HANDLE_VALUE;
//create a new file
- char ext[MAX_PATH];
- char fileName[MAX_PATH];
- char part[100];
- int len=strlen(m_szFileName)-1;
- int pos=len-1;
- while (pos>0)
- {
- if (m_szFileName[pos]=='.') break;
- pos--;
- }
- strcpy(ext, &m_szFileName[pos]);
- strncpy(fileName, m_szFileName, pos);
- fileName[pos]=0;
- sprintf(part,"_p%d",m_iPart);
- char newFileName[MAX_PATH];
- sprintf(newFileName,"%s%s%s",fileName,part,ext);
+ wchar_t ext[MAX_PATH];
+ wchar_t fileName[MAX_PATH];
+ wchar_t part[100];
+ int len=wcslen(m_wszFileName)-1;
+ int pos=len-1;
+ while (pos>0)
+ {
+ if (m_wszFileName[pos]==L'.') break;
+ pos--;
+ }
+ wcscpy(ext, &m_wszFileName[pos]);
+ wcsncpy(fileName, m_wszFileName, pos);
+ fileName[pos]=0;
+ swprintf_s(part,L"_p%d",m_iPart);
+ wchar_t newFileName[MAX_PATH];
+ swprintf_s(newFileName,L"%s%s%s",fileName,part,ext);
+ LogDebug(L"Recorder:Create new file:'%s' %d",newFileName);
+ m_hFile = CreateFileW(newFileName, // The filename
+ (DWORD) GENERIC_WRITE, // File access
+ (DWORD) FILE_SHARE_READ, // Share access
+ NULL, // Security
+ (DWORD) OPEN_ALWAYS, // Open flags
+ (DWORD) 0, // More flags
+ NULL); // Template
+ if (m_hFile == INVALID_HANDLE_VALUE)
+ {
+ LogDebug(L"Recorder:unable to create file:'%s' %d",newFileName, GetLastError());
+ m_iWriteBufferPos=0;
+ return ;
+ }
+ m_iPart++;
+ WriteFile(m_hFile, (PVOID)m_pWriteBuffer, (DWORD)m_iWriteBufferPos, &written, NULL);
+ }//of if (ERROR_FILE_TOO_LARGE == GetLastError())
+ else
+ {
+ LogDebug(L"Recorder:unable to write file:'%s' %d %d %x",m_wszFileName, GetLastError(),m_iWriteBufferPos,m_hFile);
+ }
+ }//of if (FALSE == WriteFile(m_hFile, (PVOID)m_pWriteBuffer, (DWORD)m_iWriteBufferPos, &written, NULL))
+ }//if (m_hFile!=INVALID_HANDLE_VALUE)
+ }//if (m_iWriteBufferPos>0)
+ m_iWriteBufferPos=0;
+ }
+ catch(...)
+ {
+ LogDebug("Recorder:Write exception");
+ }
+ }// of if (len + m_iWriteBufferPos >= RECORD_BUFFER_SIZE)
- LogDebug("Recorder:Create new file:'%s' %d",newFileName);
- m_hFile = CreateFile(newFileName, // The filename
- (DWORD) GENERIC_WRITE, // File access
- (DWORD) FILE_SHARE_READ, // Share access
- NULL, // Security
- (DWORD) OPEN_ALWAYS, // Open flags
- (DWORD) 0, // More flags
- NULL); // Template
- if (m_hFile == INVALID_HANDLE_VALUE)
- {
- LogDebug("Recorder:unable to create file:'%s' %d",newFileName, GetLastError());
- m_iWriteBufferPos=0;
- return ;
- }
- m_iPart++;
- WriteFile(m_hFile, (PVOID)m_pWriteBuffer, (DWORD)m_iWriteBufferPos, &written, NULL);
- }//of if (ERROR_FILE_TOO_LARGE == GetLastError())
- else
- {
- LogDebug("Recorder:unable to write file:'%s' %d %d %x",m_szFileName, GetLastError(),m_iWriteBufferPos,m_hFile);
- }
- }//of if (FALSE == WriteFile(m_hFile, (PVOID)m_pWriteBuffer, (DWORD)m_iWriteBufferPos, &written, NULL))
- }//if (m_hFile!=INVALID_HANDLE_VALUE)
- }//if (m_iWriteBufferPos>0)
- m_iWriteBufferPos=0;
- }
- catch(...)
- {
- LogDebug("Recorder:Write exception");
- }
- }// of if (len + m_iWriteBufferPos >= RECORD_BUFFER_SIZE)
-
- if ( (m_iWriteBufferPos+len) < RECORD_BUFFER_SIZE && len > 0)
- {
- memcpy(&m_pWriteBuffer[m_iWriteBufferPos],buffer,len);
- m_iWriteBufferPos+=len;
- }
- } catch (...) { WriteLog("Exception in writetorecording");}
+ if ( (m_iWriteBufferPos+len) < RECORD_BUFFER_SIZE && len > 0)
+ {
+ memcpy(&m_pWriteBuffer[m_iWriteBufferPos],buffer,len);
+ m_iWriteBufferPos+=len;
+ }
+ } catch (...) { WriteLog("Exception in writetorecording");}
}
void CDiskRecorder::WriteToTimeshiftFile(byte* buffer, int len)
@@ -732,6 +730,23 @@
LogDebug("Recorder: RECORD %s",logbuffer);
}
+void CDiskRecorder::WriteLog(const wchar_t* fmt,...)
+{
+ wchar_t logbuffer[2000];
+ va_list ap;
+ va_start(ap,fmt);
+
+ int tmp;
+ va_start(ap,fmt);
+ tmp=vswprintf_s(logbuffer, fmt, ap);
+ va_end(ap);
+
+ if (m_recordingMode==RecordingMode::TimeShift)
+ LogDebug(L"Recorder: TIMESHIFT %s",logbuffer);
+ else
+ LogDebug(L"Recorder: RECORD %s",logbuffer);
+}
+
void CDiskRecorder::SetPcrPid(int pcrPid)
{
CEnterCriticalSection enter(m_section);
Modified: branches/ajp8164_13/DirectShowFilters/TsWriter/source/DiskRecorder.h
===================================================================
--- branches/ajp8164_13/DirectShowFilters/TsWriter/source/DiskRecorder.h 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/TsWriter/source/DiskRecorder.h 2011-04-22 02:24:20 UTC (rev 27823)
@@ -82,7 +82,7 @@
CDiskRecorder(RecordingMode mode);
~CDiskRecorder(void);
- void SetFileName(char* pszFileName);
+ void SetFileNameW(wchar_t* pwszFileName);
void SetChannelType(int channelType);
bool Start();
void Stop();
@@ -118,6 +118,7 @@
void WriteToRecording(byte* buffer, int len);
void WriteToTimeshiftFile(byte* buffer, int len);
void WriteLog(const char *fmt, ...);
+ void WriteLog(const wchar_t *fmt, ...);
void SetPcrPid(int pcrPid);
bool IsStreamWanted(int stream_type);
void AddStream(PidInfo2 pidInfo);
@@ -134,7 +135,7 @@
RecordingMode m_recordingMode;
CPmtParser* m_pPmtParser;
bool m_bRunning;
- char m_szFileName[2048];
+ wchar_t m_wszFileName[2048];
MultiFileWriter* m_pTimeShiftFile;
HANDLE m_hFile;
CCriticalSection m_section;
Modified: branches/ajp8164_13/DirectShowFilters/TsWriter/source/FileWriter.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/TsWriter/source/FileWriter.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/TsWriter/source/FileWriter.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -31,6 +31,7 @@
#include <atlbase.h>
extern void LogDebug(const char *fmt, ...) ;
+extern void LogDebug(const wchar_t *fmt, ...) ;
FileWriter::FileWriter() :
m_hFile(INVALID_HANDLE_VALUE),
@@ -86,10 +87,6 @@
//
HRESULT FileWriter::OpenFile()
{
- USES_CONVERSION;
-
- TCHAR *pFileName = NULL;
-
// Is the file already opened
if (m_hFile != INVALID_HANDLE_VALUE)
{
@@ -102,14 +99,14 @@
return ERROR_INVALID_NAME;
}
- // See the the file is being read.
- m_hFile = CreateFile(W2T(m_pFileName), // The filename
+ // See the file is being read.
+ m_hFile = CreateFileW(m_pFileName, // The filename
(DWORD) GENERIC_WRITE, // File access
(DWORD) NULL, // Share access
- NULL, // Security
+ NULL, // Security
(DWORD) OPEN_ALWAYS, // Open flags
- (DWORD) 0, // More flags
- NULL); // Template
+ (DWORD) 0, // More flags
+ NULL); // Template
if (m_hFile == INVALID_HANDLE_VALUE)
{
DWORD dwErr = GetLastError();
@@ -122,15 +119,15 @@
CloseHandle(m_hFile);
// Try to open the file
- m_hFile = CreateFile(W2T(m_pFileName), // The filename
+ m_hFile = CreateFileW(m_pFileName, // The filename
(DWORD) GENERIC_WRITE, // File access
(DWORD) FILE_SHARE_READ, // Share access
- NULL, // Security
+ NULL, // Security
(DWORD) OPEN_ALWAYS, // Open flags
// (DWORD) FILE_FLAG_RANDOM_ACCESS,
// (DWORD) FILE_FLAG_WRITE_THROUGH, // More flags
- (DWORD) 0, // More flags
- NULL); // Template
+ (DWORD) 0, // More flags
+ NULL); // Template
if (m_hFile == INVALID_HANDLE_VALUE)
{
@@ -222,8 +219,7 @@
return hr;
if (written < (ULONG)lDataLength)
{
- USES_CONVERSION; // for logging WCHAR
- LogDebug("!!!!! Error writing to file %s: written %d of expected %d bytes",W2A(m_pFileName), written, lDataLength);
+ LogDebug(L"!!!!! Error writing to file %s: written %d of expected %d bytes", m_pFileName, written, lDataLength);
return S_FALSE;
}
Modified: branches/ajp8164_13/DirectShowFilters/TsWriter/source/MultiFileWriter.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/TsWriter/source/MultiFileWriter.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/TsWriter/source/MultiFileWriter.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -32,6 +32,7 @@
#include <windows.h>
#include <stdio.h>
extern void LogDebug(const char *fmt, ...) ;
+extern void LogDebug(const wchar_t *fmt, ...) ;
MultiFileWriter::MultiFileWriter(MultiFileWriterParam *pWriterParams) :
m_hTSBufferFile(INVALID_HANDLE_VALUE),
@@ -72,8 +73,6 @@
HRESULT MultiFileWriter::OpenFile(LPCWSTR pszFileName)
{
- USES_CONVERSION;
-
// Is the file already opened
if (m_hTSBufferFile != INVALID_HANDLE_VALUE)
{
@@ -85,7 +84,7 @@
if(wcslen(pszFileName) > MAX_PATH)
{
- LogDebug("MultiFileWriter: filename too long");
+ LogDebug(L"MultiFileWriter: filename too long");
return ERROR_FILENAME_EXCED_RANGE;
}
// Take a copy of the filename
@@ -106,16 +105,15 @@
LogDebug("MultiFileWriter: not enough free diskspace");
return E_FAIL;
}
- TCHAR *pFileName = NULL;
// Try to open the file
- m_hTSBufferFile = CreateFile(W2T(m_pTSBufferFileName), // The filename
+ m_hTSBufferFile = CreateFileW(m_pTSBufferFileName, // The filename
(DWORD) GENERIC_WRITE, // File access
(DWORD) FILE_SHARE_READ, // Share access
- NULL, // Security
+ NULL, // Security
(DWORD) CREATE_ALWAYS, // Open flags
- (DWORD) 0, // More flags
- NULL); // Template
+ (DWORD) 0, // More flags
+ NULL); // Template
if (m_hTSBufferFile == INVALID_HANDLE_VALUE)
{
@@ -285,11 +283,10 @@
HRESULT MultiFileWriter::CreateNewTSFile()
{
- USES_CONVERSION;
HRESULT hr;
LPWSTR pFilename = new wchar_t[MAX_PATH];
- WIN32_FIND_DATA findData;
+ WIN32_FIND_DATAW findData;
HANDLE handleFound = INVALID_HANDLE_VALUE;
//LogDebug("CreateNewTSFile.");
@@ -300,7 +297,7 @@
swprintf(pFilename, L"%s%i.ts", m_pTSBufferFileName, m_currentFilenameId);
// Check if file already exists
- handleFound = FindFirstFile(W2T(pFilename), &findData);
+ handleFound = FindFirstFileW(pFilename, &findData);
if (handleFound == INVALID_HANDLE_VALUE)
break;
@@ -331,8 +328,8 @@
if (pos)
m_currentFileId = _wtoi(pos);
wchar_t msg[MAX_PATH];
- swprintf((LPWSTR)&msg, L"New file created : %s\n", pFilename);
- ::OutputDebugString(W2T((LPWSTR)&msg));
+ swprintf(msg, L"New file created : %s\n", pFilename);
+ ::OutputDebugStringW(msg);
//LogDebug("new file created");
return S_OK;
@@ -340,25 +337,22 @@
HRESULT MultiFileWriter::ReuseTSFile()
{
- USES_CONVERSION;
HRESULT hr;
- DWORD Tmo=5 ;
+ DWORD Tmo=5 ;
LPWSTR pFilename = m_tsFileNames.at(0);
if FAILED(hr = m_pCurrentTSFile->SetFileName(pFilename))
{
- LogDebug("Failed to set filename to reuse old file");
+ LogDebug(L"Failed to set filename to reuse old file");
return hr;
}
// Check if file is being read by something.
- TCHAR sz[MAX_PATH];
- sprintf(sz, "%S", pFilename);
- // Can be locked temporarily to update duration or definitely (!) if timeshift is paused.
+ // Can be locked temporarily to update duration or definitely (!) if timeshift is paused.
do
{
- DeleteFile(sz) ; // Stupid function, return can be ok and file not deleted ( just tagged for deleting )!!!!
+ DeleteFileW(pFilename); // Stupid function, return can be ok and file not deleted ( just tagged for deleting )!!!!
hr = m_pCurrentTSFile->OpenFile() ;
if (!FAILED(hr)) break ;
Sleep(20) ;
@@ -368,11 +362,11 @@
if (Tmo)
{
if (Tmo<4) // 1 failed + 1 succeded is quasi-normal, more is a bit suspicious ( disk drive too slow or problem ? )
- LogDebug("MultiFileWriter: %d tries to succeed deleting and re-opening %ws.", 6-Tmo, pFilename);
+ LogDebug(L"MultiFileWriter: %d tries to succeed deleting and re-opening %s.", 6-Tmo, pFilename);
}
else
{
- LogDebug("MultiFileWriter: failed to create file %ws",pFilename);
+ LogDebug(L"MultiFileWriter: failed to create file %s", pFilename);
return hr ;
}
@@ -387,8 +381,8 @@
if (pos)
m_currentFileId = _wtoi(pos);
wchar_t msg[MAX_PATH];
- swprintf((LPWSTR)&msg, L"Old file reused : %s\n", pFilename);
- ::OutputDebugString(W2T((LPWSTR)&msg));
+ swprintf(msg, L"Old file reused : %s\n", pFilename);
+ ::OutputDebugStringW(msg);
//LogDebug("reuse old file");
return S_OK;
@@ -459,8 +453,6 @@
HRESULT MultiFileWriter::CleanupFiles()
{
- USES_CONVERSION;
-
m_filesAdded = 0;
m_filesRemoved = 0;
m_currentFilenameId = 0;
@@ -478,9 +470,9 @@
// If any of the files are being read then we won't
// delete any so that the full buffer stays intact.
wchar_t msg[MAX_PATH];
- swprintf((LPWSTR)&msg, L"CleanupFiles: A file is still locked : %s\n", *it);
- ::OutputDebugString(W2T((LPWSTR)&msg));
- LogDebug("CleanupFiles: A file is still locked");
+ swprintf(msg, L"CleanupFiles: A file is still locked : %s\n", *it);
+ ::OutputDebugStringW((LPWSTR)&msg);
+ LogDebug(L"CleanupFiles: A file is still locked");
return S_OK;
}
}
@@ -489,23 +481,23 @@
for (it = m_tsFileNames.begin() ; it < m_tsFileNames.end() ; it++ )
{
- if (DeleteFile(W2T(*it)) == FALSE)
+ if (DeleteFileW(*it) == FALSE)
{
wchar_t msg[MAX_PATH];
- swprintf((LPWSTR)&msg, L"Failed to delete file %s : 0x%x\n", *it, GetLastError());
- ::OutputDebugString(W2T((LPWSTR)&msg));
- LogDebug("CleanupFiles: Failed to delete file");
+ swprintf(msg, L"Failed to delete file %s : 0x%x\n", *it, GetLastError());
+ ::OutputDebugStringW(msg);
+ LogDebug(L"CleanupFiles: Failed to delete file");
}
delete[] *it;
}
m_tsFileNames.clear();
- if (DeleteFile(W2T(m_pTSBufferFileName)) == FALSE)
+ if (DeleteFileW(m_pTSBufferFileName) == FALSE)
{
wchar_t msg[MAX_PATH];
- swprintf((LPWSTR)&msg, L"Failed to delete tsbuffer file : 0x%x\n", GetLastError());
- ::OutputDebugString(W2T((LPWSTR)&msg));
- LogDebug("CleanupFiles: Failed to delete tsbuffer file: 0x%x\n", GetLastError());
+ swprintf(msg, L"Failed to delete tsbuffer file : 0x%x\n", GetLastError());
+ ::OutputDebugStringW(msg);
+ LogDebug(L"CleanupFiles: Failed to delete tsbuffer file: 0x%x\n", GetLastError());
}
m_filesAdded = 0;
@@ -517,16 +509,14 @@
BOOL MultiFileWriter::IsFileLocked(LPWSTR pFilename)
{
- USES_CONVERSION;
-
HANDLE hFile;
- hFile = CreateFile(W2T(pFilename), // The filename
+ hFile = CreateFileW(pFilename, // The filename
(DWORD) GENERIC_READ, // File access
(DWORD) NULL, // Share access
- NULL, // Security
+ NULL, // Security
(DWORD) OPEN_EXISTING, // Open flags
- (DWORD) 0, // More flags
- NULL); // Template
+ (DWORD) 0, // More flags
+ NULL); // Template
if (hFile == INVALID_HANDLE_VALUE)
return TRUE;
@@ -542,14 +532,14 @@
HRESULT hr;
- char *pszDrive = NULL;
- char szDrive[4];
- if (m_pTSBufferFileName[1] == ':')
+ wchar_t *pszDrive = NULL;
+ wchar_t szDrive[4];
+ if (m_pTSBufferFileName[1] == L':')
{
- szDrive[0] = (char)m_pTSBufferFileName[0];
- szDrive[1] = ':';
- szDrive[2] = '\\';
- szDrive[3] = '\0';
+ szDrive[0] = (wchar_t)m_pTSBufferFileName[0];
+ szDrive[1] = L':';
+ szDrive[2] = L'\\';
+ szDrive[3] = 0;
pszDrive = szDrive;
}
@@ -559,7 +549,7 @@
uliDiskSpaceAvailable.QuadPart= 0;
uliDiskSpaceTotal.QuadPart= 0;
uliDiskSpaceFree.QuadPart= 0;
- hr = GetDiskFreeSpaceEx(pszDrive, &uliDiskSpaceAvailable, &uliDiskSpaceTotal, &uliDiskSpaceFree);
+ hr = GetDiskFreeSpaceExW(pszDrive, &uliDiskSpaceAvailable, &uliDiskSpaceTotal, &uliDiskSpaceFree);
if SUCCEEDED(hr)
*llAvailableDiskSpace = uliDiskSpaceAvailable.QuadPart;
else
Modified: branches/ajp8164_13/DirectShowFilters/TsWriter/source/TsWriter.cpp
===================================================================
--- branches/ajp8164_13/DirectShowFilters/TsWriter/source/TsWriter.cpp 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/TsWriter/source/TsWriter.cpp 2011-04-22 02:24:20 UTC (rev 27823)
@@ -31,21 +31,21 @@
#include "..\..\shared\tsheader.h"
#include "..\..\shared\DebugSettings.h"
-static char logFile[MAX_PATH];
+static wchar_t logFile[MAX_PATH];
static WORD logFileParsed = -1;
-void GetLogFile(char *pLog)
+void GetLogFile(wchar_t *pLog)
{
SYSTEMTIME systemTime;
GetLocalTime(&systemTime);
if(logFileParsed != systemTime.wDay)
{
- TCHAR folder[MAX_PATH];
- ::SHGetSpecialFolderPath(NULL,folder,CSIDL_COMMON_APPDATA,FALSE);
- sprintf(logFile,"%s\\Team MediaPortal\\MediaPortal TV Server\\log\\TsWriter-%04.4d-%02.2d-%02.2d.Log",folder, systemTime.wYear, systemTime.wMonth, systemTime.wDay);
+ wchar_t folder[MAX_PATH];
+ ::SHGetSpecialFolderPathW(NULL,folder,CSIDL_COMMON_APPDATA,FALSE);
+ swprintf_s(logFile,L"%s\\Team MediaPortal\\MediaPortal TV Server\\log\\TsWriter-%04.4d-%02.2d-%02.2d.Log",folder, systemTime.wYear, systemTime.wMonth, systemTime.wDay);
logFileParsed=systemTime.wDay; // rec
}
- strcpy(pLog, &logFile[0]);
+ wcscpy(pLog, &logFile[0]);
}
// Setup data
@@ -88,34 +88,47 @@
DEFINE_TVE_DEBUG_SETTING(DumpRawTS)
static char logbuffer[2000];
-void LogDebug(const char *fmt, ...)
+static wchar_t logbufferw[2000];
+void LogDebug(const wchar_t *fmt, ...)
{
//#ifdef DEBUG
va_list ap;
va_start(ap,fmt);
- int tmp;
va_start(ap,fmt);
- tmp=vsprintf(logbuffer, fmt, ap);
+ vswprintf_s(logbufferw, fmt, ap);
va_end(ap);
- TCHAR fileName[MAX_PATH];
- GetLogFile(fileName);
- FILE* fp = fopen(fileName,"a+");
+ wchar_t fileName[MAX_PATH];
+ GetLogFile(fileName);
+ FILE* fp = _wfopen(fileName,L"a+, ccs=UTF-8");
if (fp!=NULL)
{
- SYSTEMTIME systemTime;
- GetLocalTime(&systemTime);
- fprintf(fp,"%02.2d-%02.2d-%04.4d %02.2d:%02.2d:%02.2d.%02.2d %s\n",
+ SYSTEMTIME systemTime;
+ GetLocalTime(&systemTime);
+ fwprintf(fp,L"%02.2d-%02.2d-%04.4d %02.2d:%02.2d:%02.2d.%02.2d %s\n",
systemTime.wDay, systemTime.wMonth, systemTime.wYear,
systemTime.wHour,systemTime.wMinute,systemTime.wSecond,systemTime.wMilliseconds,
- logbuffer);
+ logbufferw);
fclose(fp);
- //::OutputDebugStringA(logbuffer);::OutputDebugStringA("\n");
+ //::OutputDebugStringW(logbufferw);::OutputDebugStringW(L"\n");
}
//#endif
};
+void LogDebug(const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap,fmt);
+
+ va_start(ap,fmt);
+ vsprintf(logbuffer, fmt, ap);
+ va_end(ap);
+
+ MultiByteToWideChar(CP_ACP, 0, logbuffer, -1,logbufferw, sizeof(logbuffer)/sizeof(wchar_t));
+ LogDebug(L"%s", logbufferw);
+};
+
//
// Object creation stuff
//
@@ -642,12 +655,12 @@
return pChannel->m_pPmtGrabber->GetPMTData (pmtData);
}
-STDMETHODIMP CMpTs::RecordSetRecordingFileName( int handle,char* pszFileName)
+STDMETHODIMP CMpTs::RecordSetRecordingFileNameW( int handle, wchar_t* pwszFileName)
{
CTsChannel* pChannel=GetTsChannel(handle);
if (pChannel==NULL) return S_OK;
- pChannel->m_pRecorder->SetFileName( pszFileName);
- return S_OK;
+ pChannel->m_pRecorder->SetFileNameW(pwszFileName);
+ return S_OK;
}
STDMETHODIMP CMpTs::RecordStartRecord( int handle)
@@ -676,26 +689,24 @@
return S_OK;
}
-STDMETHODIMP CMpTs::TimeShiftSetTimeShiftingFileName( int handle, char* pszFileName)
+STDMETHODIMP CMpTs::TimeShiftSetTimeShiftingFileNameW( int handle, wchar_t* pwszFileName)
{
CTsChannel* pChannel=GetTsChannel(handle);
if (pChannel==NULL) return S_OK;
-
+
b_dumpRawPakets=false;
if (DumpRawTS())
{
- b_dumpRawPakets=true;
- string fileName=pszFileName;
- fileName=fileName.substr(0, fileName.rfind("\\"));
- fileName.append("\\raw_paket_dump.ts");
-
- LogDebug("Setting name for raw paket dump file to %s",fileName.c_str());
- WCHAR wstrFileName[2048];
- MultiByteToWideChar(CP_ACP,0,fileName.c_str(),-1,wstrFileName,1+fileName.size());
- m_rawPaketWriter->SetFileName(wstrFileName);
+ b_dumpRawPakets=true;
+ wstring fileName=pwszFileName;
+ fileName=fileName.substr(0, fileName.rfind(L"\\"));
+ fileName.append(L"\\raw_packet_dump.ts");
+
+ LogDebug(L"Setting name for raw packet dump file to %s", fileName.c_str());
+ m_rawPaketWriter->SetFileName(fileName.c_str());
}
- pChannel->m_pTimeShifting->SetFileName( pszFileName);
- return S_OK;
+ pChannel->m_pTimeShifting->SetFileNameW(pwszFileName);
+ return S_OK;
}
STDMETHODIMP CMpTs::TimeShiftStart( int handle )
{
@@ -704,7 +715,7 @@
if (b_dumpRawPakets)
{
m_rawPaketWriter->OpenFile();
- LogDebug("Raw paket dump file created. Now dumping raw pakets to dump file");
+ LogDebug("Raw packet dump file created. Now dumping raw packets to dump file");
}
if (pChannel->m_pTimeShifting->Start())
return S_OK;
@@ -719,7 +730,7 @@
if (b_dumpRawPakets)
{
m_rawPaketWriter->CloseFile();
- LogDebug("Raw paket dump file closed");
+ LogDebug("Raw packet dump file closed");
}
pChannel->m_pTimeShifting->Stop( );
return S_OK;
@@ -733,7 +744,7 @@
{
m_rawPaketWriter->CloseFile();
m_rawPaketWriter->OpenFile();
- LogDebug("Raw paket dump file reset");
+ LogDebug("Raw packet dump file reset");
}
pChannel->m_pTimeShifting->Reset( );
return S_OK;
Modified: branches/ajp8164_13/DirectShowFilters/TsWriter/source/TsWriter.h
===================================================================
--- branches/ajp8164_13/DirectShowFilters/TsWriter/source/TsWriter.h 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/DirectShowFilters/TsWriter/source/TsWriter.h 2011-04-22 02:24:20 UTC (rev 27823)
@@ -62,13 +62,13 @@
STDMETHOD(PmtGetPMTData) (THIS_ int handle, BYTE *pmtData);
- STDMETHOD(RecordSetRecordingFileName)(THIS_ int handle,char* pszFileName)PURE;
+ STDMETHOD(RecordSetRecordingFileNameW)(THIS_ int handle,wchar_t* pwszFileName)PURE;
STDMETHOD(RecordStartRecord)(THIS_ int handle)PURE;
STDMETHOD(RecordStopRecord)(THIS_ int handle)PURE;
STDMETHOD(RecordSetPmtPid)(THIS_ int handle,int mtPid,int serviceId,byte* pmtData,int pmtLength)PURE;
STDMETHOD(RecordSetVideoAudioObserver)(THIS_ int handle, IVideoAudioObserver* callback)PURE;
- STDMETHOD(TimeShiftSetTimeShiftingFileName)(THIS_ int handle, char* pszFileName)PURE;
+ STDMETHOD(TimeShiftSetTimeShiftingFileNameW)(THIS_ int handle, wchar_t* pwszFileName)PURE;
STDMETHOD(TimeShiftStart)(THIS_ int handle )PURE;
STDMETHOD(TimeShiftStop)(THIS_ int handle )PURE;
STDMETHOD(TimeShiftReset)(THIS_ int handle )PURE;
@@ -182,21 +182,21 @@
STDMETHODIMP PmtSetCallBack(int handle,IPMTCallback* callback);
STDMETHODIMP PmtGetPMTData (int handle,BYTE *pmtData);
-
- STDMETHODIMP RecordSetRecordingFileName( int handle,char* pszFileName);
+
+ STDMETHODIMP RecordSetRecordingFileNameW( int handle,wchar_t* pszFileName);
STDMETHODIMP RecordStartRecord( int handle);
STDMETHODIMP RecordStopRecord( int handle);
STDMETHODIMP RecordSetPmtPid(int handle,int mtPid,int serviceId,byte* pmtData,int pmtLength );
STDMETHODIMP RecordSetVideoAudioObserver(int handle, IVideoAudioObserver* callback);
- STDMETHODIMP TimeShiftSetTimeShiftingFileName( int handle, char* pszFileName);
+ STDMETHODIMP TimeShiftSetTimeShiftingFileNameW( int handle, wchar_t* pwszFileName);
STDMETHODIMP TimeShiftStart( int handle );
STDMETHODIMP TimeShiftStop( int handle );
STDMETHODIMP TimeShiftReset( int handle );
STDMETHODIMP TimeShiftGetBufferSize( int handle, long * size) ;
STDMETHODIMP TimeShiftSetPmtPid( int handle, int pmtPid, int serviceId,byte* pmtData,int pmtLength) ;
STDMETHODIMP TimeShiftPause( int handle, BYTE onOff) ;
- STDMETHODIMP TimeShiftSetParams(int handle, int minFiles, int maxFiles, ULONG chunkSize) ;
+ STDMETHODIMP TimeShiftSetParams(int handle, int minFiles, int maxFiles, ULONG chunkSize) ;
STDMETHODIMP TimeShiftGetCurrentFilePosition(int handle,__int64 * position,long * bufferId);
STDMETHODIMP SetVideoAudioObserver(int handle, IVideoAudioObserver* callback);
Modified: branches/ajp8164_13/Tools/InstallationScripts/DeployToolUnPacker.nsi
===================================================================
--- branches/ajp8164_13/Tools/InstallationScripts/DeployToolUnPacker.nsi 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Tools/InstallationScripts/DeployToolUnPacker.nsi 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,6 +1,6 @@
-#region Copyright (C) 2005-2010 Team MediaPortal
+#region Copyright (C) 2005-2011 Team MediaPortal
/*
-// Copyright (C) 2005-2010 Team MediaPortal
+// Copyright (C) 2005-2011 Team MediaPortal
// http://www.team-mediaportal.com
//
// MediaPortal is free software: you can redistribute it and/or modify
@@ -105,7 +105,7 @@
VIAddVersionKey CompanyWebsite "${PRODUCT_WEB_SITE}"
VIAddVersionKey FileVersion "${VERSION}"
VIAddVersionKey FileDescription "${PRODUCT_NAME} installation ${VERSION}"
-VIAddVersionKey LegalCopyright "Copyright 2005-2009 ${PRODUCT_PUBLISHER}"
+VIAddVersionKey LegalCopyright "Copyright 2005-2011 ${PRODUCT_PUBLISHER}"
;if we want to make it fully silent we can uncomment this
;SilentInstall silent
Modified: branches/ajp8164_13/Tools/LogoAutoRenamer/LogoAutoRenamer.csproj
===================================================================
--- branches/ajp8164_13/Tools/LogoAutoRenamer/LogoAutoRenamer.csproj 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Tools/LogoAutoRenamer/LogoAutoRenamer.csproj 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,6 +11,11 @@
<RootNamespace>LogoAutoRenamer</RootNamespace>
<AssemblyName>LogoAutoRenamer</AssemblyName>
<ApplicationManifest>LogoAutoRenamer.exe.manifest</ApplicationManifest>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: branches/ajp8164_13/Tools/LogoAutoRenamer/LogoAutoRenamer.sln
===================================================================
--- branches/ajp8164_13/Tools/LogoAutoRenamer/LogoAutoRenamer.sln 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Tools/LogoAutoRenamer/LogoAutoRenamer.sln 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,6 +1,6 @@

-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogoAutoRenamer", "LogoAutoRenamer.csproj", "{B69C6A60-2335-4373-A87D-184D41705EDA}"
EndProject
Global
Modified: branches/ajp8164_13/Tools/LogoAutoRenamer/MainForm.cs
===================================================================
--- branches/ajp8164_13/Tools/LogoAutoRenamer/MainForm.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Tools/LogoAutoRenamer/MainForm.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -56,6 +56,17 @@
File.Delete(log);
StreamWriter tw = File.AppendText(log);
+ tw.WriteLine("");
+ tw.WriteLine("******************************");
+ tw.WriteLine(" Searching for TV/Radio logos ");
+ tw.WriteLine("******************************");
+ tw.WriteLine("");
+ tw.WriteLine("Source : " + textBoxSrc.Text);
+ tw.WriteLine("Destination : " + textBoxDst.Text);
+ tw.WriteLine("Channels list: " + textboxXml.Text);
+ tw.WriteLine("");
+ tw.WriteLine("******************************");
+
foreach (string dir in dirs)
{
if (!Directory.Exists(dir))
@@ -136,20 +147,30 @@
}
string chNameLog = ("<" + chName + ">").PadRight(40, ' ') + "[" + chType + "]";
+ string src = textBoxSrc.Text + "\\" + logoName;
+ string dir = chType.Trim() == "TV" ? "TV\\logos" : "Radio";
+ string dst = textBoxDst.Text + "\\" + dir + "\\" + chName + ".png";
+
if (foundLogo)
{
- string src = textBoxSrc.Text + "\\" + logoName;
- string dir = chType.Trim() == "TV" ? "TV\\logos" : "Radio";
- string dst = textBoxDst.Text + "\\" + dir + "\\" + chName + ".png";
Image image = Image.FromFile(src);
image.Save(dst, ImageFormat.Png);
- tw.WriteLine(chNameLog + ": found logo <" + logoName + ">");
+ string tmp = "<" + logoName + ">";
+ tw.WriteLine(chNameLog + ": found " + tmp.PadRight(30, ' ') + " [overwritten if present]");
iChWithLogo++;
}
else
{
- tw.WriteLine(chNameLog + ": no logo available");
- iChNoLogo++;
+ if (File.Exists(dst))
+ {
+ tw.WriteLine(chNameLog + ": already exist");
+ iChWithLogo++;
+ }
+ else
+ {
+ tw.WriteLine(chNameLog + ": not available");
+ iChNoLogo++;
+ }
}
}
}
Modified: branches/ajp8164_13/Tools/LogoAutoRenamer/Properties/Resources.Designer.cs
===================================================================
--- branches/ajp8164_13/Tools/LogoAutoRenamer/Properties/Resources.Designer.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Tools/LogoAutoRenamer/Properties/Resources.Designer.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4927
+// Runtime Version:4.0.30319.225
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: branches/ajp8164_13/Tools/LogoAutoRenamer/Properties/Settings.Designer.cs
===================================================================
--- branches/ajp8164_13/Tools/LogoAutoRenamer/Properties/Settings.Designer.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Tools/LogoAutoRenamer/Properties/Settings.Designer.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4927
+// Runtime Version:4.0.30319.225
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: branches/ajp8164_13/Tools/LogoAutoRenamer/bin/Release/LogoAutoRenamer.exe
===================================================================
(Binary files differ)
Modified: branches/ajp8164_13/Tools/MediaPortal.DeployTool/Utils.cs
===================================================================
--- branches/ajp8164_13/Tools/MediaPortal.DeployTool/Utils.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/Tools/MediaPortal.DeployTool/Utils.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -553,7 +553,7 @@
case "max":
major = 1;
minor = 1;
- revision = 6; // 1.1.6 = 1.2.0 Beta
+ revision = 7; // 1.1.7 = 1.2.0 Beta
break;
}
return CalculateVersion(major, minor, revision);
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/Setup/setup.nsi
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/Setup/setup.nsi 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/Setup/setup.nsi 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,6 +1,6 @@
-#region Copyright (C) 2005-2010 Team MediaPortal
+#region Copyright (C) 2005-2011 Team MediaPortal
/*
-// Copyright (C) 2005-2010 Team MediaPortal
+// Copyright (C) 2005-2011 Team MediaPortal
// http://www.team-mediaportal.com
//
// MediaPortal is free software: you can redistribute it and/or modify
@@ -221,7 +221,7 @@
VIAddVersionKey /LANG=${LANG_ENGLISH} CompanyWebsite "${PRODUCT_WEB_SITE}"
VIAddVersionKey /LANG=${LANG_ENGLISH} FileVersion "${VERSION}"
VIAddVersionKey /LANG=${LANG_ENGLISH} FileDescription "${PRODUCT_NAME} installation ${VERSION}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} LegalCopyright "Copyright 2005-2009 ${PRODUCT_PUBLISHER}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} LegalCopyright "Copyright 2005-2011 ${PRODUCT_PUBLISHER}"
ShowUninstDetails show
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/SetupTv/57_upgrade_mysql_database.sql
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/SetupTv/57_upgrade_mysql_database.sql 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/SetupTv/57_upgrade_mysql_database.sql 2011-04-22 02:24:20 UTC (rev 27823)
@@ -1,7 +1,7 @@
USE %TvLibrary%;
-ALTER TABLE channel DROP COLUMN name;
-ALTER TABLE channel DROP COLUMN freetoair;
+ALTER TABLE Channel DROP COLUMN name;
+ALTER TABLE Channel DROP COLUMN freetoair;
UPDATE Version SET versionNumber=57;
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Graphs/Analog/AnalogSubChannel.cs
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Graphs/Analog/AnalogSubChannel.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Graphs/Analog/AnalogSubChannel.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -162,7 +162,7 @@
_mpRecord.SetVideoAudioObserver(_subChannelId, this);
_mpRecord.SetTimeShiftParams(_subChannelId, parameters.MinimumFiles, parameters.MaximumFiles,
parameters.MaximumFileSize);
- _mpRecord.SetTimeShiftFileName(_subChannelId, fileName);
+ _mpRecord.SetTimeShiftFileNameW(_subChannelId, fileName);
// Set the channel type
if (CurrentChannel == null)
@@ -202,7 +202,7 @@
_card.Quality.StartRecord();
}
Log.Log.WriteFile("analog:StartRecord({0})", fileName);
- _mpRecord.SetRecordingFileName(_subChannelId, fileName);
+ _mpRecord.SetRecordingFileNameW(_subChannelId, fileName);
_mpRecord.SetRecorderVideoAudioObserver(_subChannelId, this);
_mpRecord.StartRecord(_subChannelId);
}
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Graphs/HDPVR/HDPVRChannel.cs
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Graphs/HDPVR/HDPVRChannel.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Graphs/HDPVR/HDPVRChannel.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -26,234 +26,113 @@
using TvLibrary.Interfaces;
using TvLibrary.Implementations.Helper;
using TvLibrary.Interfaces.Analyzer;
+using TvLibrary.Implementations.DVB;
+using TvLibrary.Implementations.DVB.Structures;
+using TvLibrary.Channels;
namespace TvLibrary.Implementations.Analog
{
/// <summary>
/// Implementation of <see cref="T:TvLibrary.Interfaces.ITVCard"/> which handles analog tv cards
/// </summary>
- public class HDPVRChannel : BaseSubChannel, ITvSubChannel, IVideoAudioObserver, IPMTCallback
+ public class HDPVRChannel : TvDvbChannel, ITvSubChannel, IVideoAudioObserver, IPMTCallback
{
- #region variables
+ #region constants
private readonly TvCardHDPVR _card;
- private readonly IBaseFilter _filterTsWriter;
- private readonly ITsFilter _tsFilterInterface;
- private Int32 _pmtPid;
- private const int _serviceID = 1;
- private Int32 _pmtVersion = -1;
- private int _pmtLength;
- private byte[] _pmtData;
- private bool _graphRunning;
+ // The Hauppauge HD PVR and Colossus deliver a DVB stream with a single service on a fixed
+ // service ID with a fixed PMT PID.
+ private readonly String _deviceType;
+ private readonly int SERVICE_ID = 1;
+ private readonly int PMT_PID = 0x100;
+
#endregion
/// <summary>
- /// Initializes a new instance of the <see cref="AnalogSubChannel"/> class.
+ /// Initializes a new instance of the <see cref="HDPVRChannel"/> class.
/// </summary>
- public HDPVRChannel(TvCardHDPVR card, Int32 subchannelId, IChannel channel, IBaseFilter filterTsWriter)
+ public HDPVRChannel(TvCardHDPVR card, String deviceType, Int32 subchannelId, IBaseFilter filterTsWriter, IFilterGraph2 graphBuilder)
{
+ _eventPMT = new ManualResetEvent(false);
+ _graphState = GraphState.Created;
+ _graphBuilder = graphBuilder;
+ _channelInfo = new ChannelInfo();
+ _pmtPid = -1;
+ _subChannelIndex = -1;
+
+ // Keep a reference to the card for quality control.
_card = card;
- _subChannelId = subchannelId;
- _currentChannel = channel;
- _filterTsWriter = filterTsWriter;
- _hasTeletext = false;
- _tsFilterInterface = (ITsFilter)_filterTsWriter;
- _tsFilterInterface.AddChannel(ref _subChannelId);
- _pmtData = null;
- _pmtLength = 0;
- }
- #region tuning and graph methods
-
- /// <summary>
- /// Should be called before tuning to a new channel
- /// resets the state
- /// </summary>
- public override void OnBeforeTune()
- {
- Log.Log.WriteFile("HDPVR: subch:{0} OnBeforeTune", _subChannelId);
- if (IsTimeShifting)
+ // What kind of device is this (assumed to be HD PVR by default)?
+ _deviceType = deviceType;
+ if (deviceType.Equals("Colossus"))
{
- if (_subChannelId >= 0)
- {
- _tsFilterInterface.TimeShiftPause(_subChannelId, 1);
- }
+ PMT_PID = 0x20;
}
- }
- /// <summary>
- /// Should be called when the graph is tuned to the new channel
- /// resets the state
- /// </summary>
- public override void OnAfterTune()
- {
- Log.Log.WriteFile("HDPVR: subch:{0} OnAfterTune", _subChannelId);
- if (IsTimeShifting && _subChannelId >= 0)
- {
- _tsFilterInterface.TimeShiftPause(_subChannelId, 0);
+ _tsFilterInterface = (ITsFilter)filterTsWriter;
+ _tsFilterInterface.AddChannel(ref _subChannelIndex);
+ _subChannelId = subchannelId;
+ _timeshiftFileName = "";
+ _recordingFileName = "";
+ _pmtData = null;
+ _pmtLength = 0;
- //hack
- OnNotify(PidType.Audio);
- OnNotify(PidType.Video);
- }
+ _grabTeletext = false;
+ _mdplugs = null;
}
/// <summary>
- /// Should be called when the graph is about to start
- /// Resets the state
- /// If graph is already running, starts the pmt grabber to grab the
- /// pmt for the new channel
+ /// Destructor
/// </summary>
- public override void OnGraphStart()
+ ~HDPVRChannel()
{
- Log.Log.WriteFile("HDPVR: subch:{0} OnGraphStart", _subChannelId);
-
- if (SetupPmtGrabber(256, _serviceID))
+ if (_eventPMT != null)
{
- DateTime dtNow = DateTime.Now;
- while (_pmtVersion < 0)
- {
- Log.Log.Write("subch:{0} wait for pmt", _subChannelId);
- Thread.Sleep(20);
- TimeSpan ts = DateTime.Now - dtNow;
- if (ts.TotalMilliseconds >= 10)
- {
- Log.Log.Debug("Timedout waiting for PMT after {0} seconds. Increase the PMT timeout value?", ts.TotalSeconds);
- break;
- }
- }
+ _eventPMT.Close();
}
}
- /// <summary>
- /// Instructs the ts analyzer filter to start grabbing the PMT
- /// </summary>
- /// <param name="pmtPid">pid of the PMT</param>
- /// <param name="serviceId">The service id.</param>
- protected bool SetupPmtGrabber(int pmtPid, int serviceId)
- {
- Log.Log.Info("subch:{0} SetupPmtGrabber:pid {1:X} sid:{2:X}", _subChannelId, pmtPid, serviceId);
- if (pmtPid < 0)
- return false;
- if (pmtPid == _pmtPid)
- return false;
- _pmtVersion = -1;
- _pmtPid = pmtPid;
- Log.Log.Write("subch:{0} set pmt grabber pmt:{1:X} sid:{2:X}", _subChannelId, pmtPid, serviceId);
- _tsFilterInterface.PmtSetCallBack(_subChannelId, this);
- _tsFilterInterface.PmtSetPmtPid(_subChannelId, pmtPid, serviceId);
+ #region tuning and graph method overrides
- OnAfterTuneEvent();
- return true;
- }
-
/// <summary>
- /// Should be called when the graph has been started
- /// sets up the pmt grabber to grab the pmt of the channel
+ /// Start timeshifting
/// </summary>
- public override void OnGraphStarted()
- {
- Log.Log.WriteFile("HDPVR: subch:{0} OnGraphStarted", _subChannelId);
- _graphRunning = true;
- _dateTimeShiftStarted = DateTime.MinValue;
- SetupPmtGrabber(_pmtPid, _serviceID);
- //_pmtTimer.Enabled = true;
- while (_pmtVersion < 0)
- {
- Log.Log.Write("subch:{0} wait for pmt:{1:X}", _subChannelId, _pmtPid);
- Thread.Sleep(20);
- }
- }
-
- /// <summary>
- /// Should be called when graph is about to stop.
- /// stops any timeshifting/recording on this channel
- /// </summary>
- public override void OnGraphStop()
- {
- if (_tsFilterInterface != null)
- {
- _tsFilterInterface.RecordStopRecord(_subChannelId);
- _tsFilterInterface.TimeShiftStop(_subChannelId);
- }
- }
-
- /// <summary>
- /// should be called when graph has been stopped
- /// Resets the graph state
- /// </summary>
- public override void OnGraphStopped() {}
-
- #endregion
-
- #region Timeshifting - Recording methods
-
- /// <summary>
- /// sets the filename used for timeshifting
- /// </summary>
/// <param name="fileName">timeshifting filename</param>
protected override bool OnStartTimeShifting(string fileName)
{
- _timeshiftFileName = fileName;
- Log.Log.WriteFile("HDPVR: SetTimeShiftFileName:{0}", fileName);
- Log.Log.WriteFile("HDPVR: SetTimeShiftFileName: _subChannelId {0}", _subChannelId);
- ScanParameters parameters = _card.Parameters;
- _tsFilterInterface.TimeShiftSetParams(_subChannelId, parameters.MinimumFiles, parameters.MaximumFiles,
- parameters.MaximumFileSize);
- _tsFilterInterface.TimeShiftSetTimeShiftingFileName(_subChannelId, fileName);
-
- if (CurrentChannel == null)
+ if (_card.SupportsQualityControl && !IsRecording)
{
- Log.Log.Error("CurrentChannel is null when trying to start timeshifting");
- return false;
+ _card.Quality.StartPlayback();
}
-
- // Set the channel type (0=tv, 1=radio)
- _tsFilterInterface.TimeShiftSetChannelType(_subChannelId, (CurrentChannel.IsTv ? 0 : 1));
-
- _tsFilterInterface.TimeShiftPause(_subChannelId, 1);
- _tsFilterInterface.TimeShiftSetPmtPid(_subChannelId, 0x0100, 1, _pmtData, _pmtLength);
- _tsFilterInterface.AnalyzerSetVideoPid(_subChannelId, 0x1011);
- _tsFilterInterface.AnalyzerSetAudioPid(_subChannelId, 0x1100);
- _tsFilterInterface.TimeShiftPause(_subChannelId, 0);
-
- _tsFilterInterface.SetVideoAudioObserver(_subChannelId, this);
- _tsFilterInterface.TimeShiftStart(_subChannelId);
- _dateTimeShiftStarted = DateTime.Now;
-
- return true;
+ return base.OnStartTimeShifting(fileName);
}
/// <summary>
- /// Stops timeshifting
+ /// Stop timeshifting
/// </summary>
/// <returns></returns>
protected override void OnStopTimeShifting()
{
- Log.Log.WriteFile("HDPVR: StopTimeShifting()");
- _tsFilterInterface.SetVideoAudioObserver(_subChannelId, null);
- _tsFilterInterface.TimeShiftStop(_subChannelId);
+ base.OnStopTimeShifting();
+ if (_card.SupportsQualityControl && IsRecording)
+ {
+ _card.Quality.StartRecord();
+ }
}
/// <summary>
- /// Starts recording
+ /// Start recording
/// </summary>
- /// <param name="fileName">filename to which to recording should be saved</param>
- /// <returns></returns>
+ /// <param name="fileName">recording filename</param>
protected override void OnStartRecording(string fileName)
{
- _recordingFileName = fileName;
- _tsFilterInterface.RecordSetRecordingFileName(_subChannelId, fileName);
- _tsFilterInterface.RecordSetPmtPid(_subChannelId, 0x0100, 1, _pmtData, _pmtLength);
- _startRecording = true;
- _tsFilterInterface.RecorderSetVideoAudioObserver(_subChannelId, this);
- int hr = _tsFilterInterface.RecordStartRecord(_subChannelId);
- if (hr != 0)
+ if (_card.SupportsQualityControl)
{
- Log.Log.Error("subch:{0} StartRecord failed:{1:X}", _subChannelId, hr);
+ _card.Quality.StartRecord();
}
- _graphState = GraphState.Recording;
+ base.OnStartRecording(fileName);
}
/// <summary>
@@ -262,8 +141,7 @@
/// <returns></returns>
protected override void OnStopRecording()
{
- Log.Log.WriteFile("HDPVR: StopRecord()");
- _tsFilterInterface.RecordStopRecord(_subChannelId);
+ base.OnStopRecording();
if (_card.SupportsQualityControl && IsTimeShifting)
{
_card.Quality.StartPlayback();
@@ -271,133 +149,82 @@
}
/// <summary>
- /// Returns the position in the current timeshift file and the id of the current timeshift file
+ /// Wait for PMT to be found in the transport stream.
/// </summary>
- /// <param name="position">The position in the current timeshift buffer file</param>
- /// <param name="bufferId">The id of the current timeshift buffer file</param>
- protected override void OnGetTimeShiftFilePosition(ref Int64 position, ref long bufferId)
+ /// <returns><c>true</c> if PMT was found, otherwise <c>false</c></returns>
+ protected override bool WaitForPMT()
{
- _tsFilterInterface.TimeShiftGetCurrentFilePosition(_subChannelId, out position, out bufferId);
- }
+ SetupPmtGrabber(PMT_PID, SERVICE_ID);
+ if (!_eventPMT.WaitOne(_parameters.TimeOutPMT * 1000, true))
+ {
+ return false;
+ }
- #endregion
+ // Once we receive PMT...
+ IntPtr pmtMem = Marshal.AllocCoTaskMem(4096); // max. size for pmt
+ try
+ {
+ _pmtLength = _tsFilterInterface.PmtGetPMTData(_subChannelIndex, pmtMem);
+ if (_pmtLength < 6)
+ {
+ return false;
+ }
- #region audio streams
+ // Check the program number.
+ _pmtData = new byte[_pmtLength];
+ Marshal.Copy(pmtMem, _pmtData, 0, _pmtLength);
+ int version = ((_pmtData[5] >> 1) & 0x1F);
+ int pmtProgramNumber = (_pmtData[3] << 8) + _pmtData[4];
+ Log.Log.Info("HDPVR: PMT sid=0x{0:X} pid=0x{1:X} version=0x{2:X}", pmtProgramNumber, _pmtPid, version);
+ if (pmtProgramNumber != SERVICE_ID)
+ {
+ throw new TvException("HDPVRChannel.WaitForPMT: PMT program doesn't match HDPVR service ID");
+ }
- /// <summary>
- /// returns the list of available audio streams
- /// </summary>
- public override List<IAudioStream> AvailableAudioStreams
- {
- get { return null; }
- }
-
- /// <summary>
- /// get/set the current selected audio stream
- /// </summary>
- public override IAudioStream CurrentAudioStream
- {
- get { return null; }
- set { }
- }
-
- #endregion
-
- #region video stream
-
- /// <summary>
- /// Returns true when unscrambled audio/video is received otherwise false
- /// </summary>
- /// <returns>true of false</returns>
- public override bool IsReceivingAudioVideo
- {
- get { return true; }
- }
-
- /// <summary>
- /// Returns the video format (always returns MPEG2).
- /// </summary>
- /// <value>The number of channels decrypting.</value>
- public override IVideoStream GetCurrentVideoStream
- {
- get
+ // Get the program PIDs.
+ _pmtVersion = version;
+ _channelInfo = new ChannelInfo();
+ _channelInfo.DecodePmt(_pmtData);
+ _channelInfo.serviceID = pmtProgramNumber;
+ _channelInfo.network_pmt_PID = _pmtPid;
+ SetMpegPidMapping(_channelInfo);
+ return true;
+ }
+ finally
{
- VideoStream stream = new VideoStream();
- return stream;
+ Marshal.FreeCoTaskMem(pmtMem);
}
}
- #endregion
-
- #region teletext
-
/// <summary>
- /// A derrived class should activate or deactivate the teletext grabbing on the tv card.
+ /// Stub override to allow inherritance from TvDvbChannel.
/// </summary>
- protected override void OnGrabTeletext() {}
-
- #endregion
-
- #region OnDecompose
-
- /// <summary>
- /// Decomposes this subchannel
- /// </summary>
- protected override void OnDecompose()
+ protected override bool SendPmtToCam(out bool updatePids, out int waitInterval)
{
- if (_tsFilterInterface != null)
- {
- _tsFilterInterface.DeleteChannel(_subChannelId);
- }
+ updatePids = false;
+ waitInterval = 0;
+ return true;
}
#endregion
+ #region IPMTCallback Members
+
/// <summary>
/// Called when the PMT has been received.
/// </summary>
/// <returns></returns>
- public int OnPMTReceived(int pmtPid)
+ public override int OnPMTReceived(int pmtPid)
{
- IntPtr pmtMem = Marshal.AllocCoTaskMem(4096); // max. size for pmt
- _pmtLength = _tsFilterInterface.PmtGetPMTData(_subChannelId, pmtMem);
- if (_pmtLength > 6)
+ Log.Log.WriteFile("HDPVR: OnPMTReceived() subch:{0} pid 0x{1:X}", _subChannelId, pmtPid);
+ if (_eventPMT != null)
{
- _pmtData = new byte[_pmtLength];
+ _eventPMT.Set();
}
-
- Marshal.Copy(pmtMem, _pmtData, 0, _pmtLength);
- Marshal.FreeCoTaskMem(pmtMem);
-
- _pmtVersion++;
-
- try
- {
- Log.Log.WriteFile("subch:{0} OnPMTReceived() {1}", _subChannelId, _graphRunning);
- if (_graphRunning == false)
- return 0;
- _pmtVersion++;
- }
- catch (Exception ex)
- {
- Log.Log.Write(ex);
- }
-
+ _pmtPid = pmtPid;
return 0;
}
- ///<summary>
- /// Called when a pid is detected
- ///</summary>
- ///<param name="pidType">The pid type</param>
- ///<returns>Error code</returns>
- public new int OnNotify(PidType pidType)
- {
- if (pidType == PidType.Video)
- {
- Thread.Sleep(1000);
- }
- return base.OnNotify(pidType);
- }
+ #endregion
}
}
\ No newline at end of file
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Graphs/HDPVR/TVCardHDPVR.cs
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Graphs/HDPVR/TVCardHDPVR.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Graphs/HDPVR/TVCardHDPVR.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -21,8 +21,10 @@
using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
using DirectShowLib;
using TvLibrary.ChannelLinkage;
+using TvLibrary.Channels;
using TvLibrary.Epg;
using TvLibrary.Implementations.Analog.QualityControl;
using TvLibrary.Interfaces;
@@ -32,14 +34,17 @@
namespace TvLibrary.Implementations.Analog
{
/// <summary>
- /// Class for handling HDPVR
+ /// Class for handling supported capture cards, including the Hauppauge HD PVR and Colossus.
/// </summary>
public class TvCardHDPVR : TvCardBase, ITVCard
{
- #region const
+ #region constants
- private const string _captureDeviceName = "Hauppauge HD PVR Capture Device";
- private const string _encoderDeviceName = "Hauppauge HD PVR Encoder";
+ // Assume the capture card is a Hauppauge HD PVR by default.
+ private readonly string _deviceType = "HDPVR";
+ private readonly string _crossbarDeviceName = "Hauppauge HD PVR Crossbar";
+ private readonly string _captureDeviceName = "Hauppauge HD PVR Capture Device";
+ private readonly string _encoderDeviceName = "Hauppauge HD PVR Encoder";
#endregion
@@ -88,12 +93,27 @@
#region ctor
///<summary>
- /// Constrcutor for the HD PVR device
+ /// Constructor for a capture card device.
///</summary>
- ///<param name="device">HDPVR encoder device</param>
+ ///<param name="device">A crossbar device for a supported capture card.</param>
public TvCardHDPVR(DsDevice device)
: base(device)
{
+ // Determine what type of card this is.
+ if (device.Name.Contains("Colossus"))
+ {
+ Match match = Regex.Match(device.Name, @".*?(\d+)$");
+ int deviceNumber = 0;
+ if (match.Success)
+ {
+ deviceNumber = Convert.ToInt32(match.Groups[1].Value);
+ }
+ _deviceType = "Colossus";
+ _crossbarDeviceName = device.Name;
+ _captureDeviceName = "Hauppauge Colossus Capture " + deviceNumber;
+ _encoderDeviceName = "Hauppauge Colossus TS Encoder " + deviceNumber;
+ }
+
_mapSubChannels = new Dictionary<Int32, BaseSubChannel>();
_supportsSubChannels = true;
_minChannel = 0;
@@ -312,8 +332,10 @@
private Int32 GetNewSubChannel(IChannel channel)
{
int id = _subChannelId++;
- Log.Log.Info("HDPVR:GetNewSubChannel:{0} #{1}", _mapSubChannels.Count, id);
- HDPVRChannel subChannel = new HDPVRChannel(this, id, channel, _filterTsWriter);
+ Log.Log.Info("HDPVR: GetNewSubChannel:{0} #{1}", _mapSubChannels.Count, id);
+ HDPVRChannel subChannel = new HDPVRChannel(this, _deviceType, id, _filterTsWriter, _graphBuilder);
+ subChannel.Parameters = Parameters;
+ subChannel.CurrentChannel = channel;
_mapSubChannels[id] = subChannel;
return id;
}
@@ -526,13 +548,13 @@
}
_graphState = GraphState.Created;
- _configuration.Graph.Crossbar.Name = "Hauppauge HD PVR Crossbar";
+ _configuration.Graph.Crossbar.Name = _crossBarDevice.Name;
_configuration.Graph.Crossbar.VideoPinMap = _videoPinMap;
_configuration.Graph.Crossbar.AudioPinMap = _audioPinMap;
_configuration.Graph.Crossbar.VideoPinRelatedAudioMap = _videoPinRelatedAudioMap;
_configuration.Graph.Crossbar.VideoOut = _videoOutPinIndex;
_configuration.Graph.Crossbar.AudioOut = _audioOutPinIndex;
- _configuration.Graph.Capture.Name = _captureDeviceName;
+ _configuration.Graph.Capture.Name = _captureDevice.Name;
_configuration.Graph.Capture.FrameRate = -1d;
_configuration.Graph.Capture.ImageHeight = -1;
_configuration.Graph.Capture.ImageWidth = -1;
@@ -763,7 +785,7 @@
IPin pinOut = DsFindPin.ByDirection(_filterEncoder, PinDirection.Output, 0);
if (pinOut == null)
{
- Log.Log.Error("HDPVR: Unable to find output pin on the encoder filter");
+ Log.Log.Error("HDPVR: Unable to find output pin on the encoder filter");
throw new TvException("unable to find output pin on the encoder filter");
}
IPin pinIn = DsFindPin.ByDirection(_filterTsWriter, PinDirection.Input, 0);
@@ -818,11 +840,12 @@
{
_mapSubChannels[subChannel].AfterTuneEvent -= new BaseSubChannel.OnAfterTuneDelegate(OnAfterTuneEvent);
_mapSubChannels[subChannel].AfterTuneEvent += new BaseSubChannel.OnAfterTuneDelegate(OnAfterTuneEvent);
- _mapSubChannels[subChannel].OnGraphStarted();
+ _mapSubChannels[subChannel].OnGraphStart();
}
if (graphRunning)
{
+ Log.Log.Write("HDPVR: Graph already running");
return;
}
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/BaseSubChannel.cs
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/BaseSubChannel.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/BaseSubChannel.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -370,6 +370,7 @@
Log.Log.Info("Unknown subch:{0} Started recording", _subChannelId);
}
+ _dateRecordingStarted = DateTime.Now;
_graphState = GraphState.Recording;
}
catch (Exception e)
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/DvbBaseScanning.cs
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/DvbBaseScanning.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/DvbBaseScanning.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -156,6 +156,11 @@
/// </summary>
AdvancedCodecHdNvodReference = 0x1B,
+ /// <summary>
+ /// sky germany linked channels (option channels)
+ /// </summary>
+ SkyGermanyOptionChannel = 0xd3
+
// (0x1C to 0x7F reserved)
// (0x80 to 0xFE user defined)
// (0xFF reserved)
@@ -563,7 +568,8 @@
serviceType == (int)DvbServiceType.DigitalTelevision ||
serviceType == (int)DvbServiceType.Mpeg2HdDigitalTelevision ||
serviceType == (int)DvbServiceType.AdvancedCodecSdDigitalTelevision ||
- serviceType == (int)DvbServiceType.AdvancedCodecHdDigitalTelevision)
+ serviceType == (int)DvbServiceType.AdvancedCodecHdDigitalTelevision ||
+ serviceType == (int)DvbServiceType.SkyGermanyOptionChannel)
{
return true;
}
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvCardDvbBase.cs
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvCardDvbBase.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvCardDvbBase.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -515,8 +515,33 @@
Log.Log.WriteFile("dvb:Submit tunerequest calling put_TuneRequest");
int hr = ((ITuner)_filterNetworkProvider).put_TuneRequest(tuneRequest);
Log.Log.WriteFile("dvb:Submit tunerequest done calling put_TuneRequest");
- if (hr != 0)
+
+ // NOTE
+ // After mantis 3469 is confirmed working in 1.2.0 beta remove these comments and everything:
+ // ***** FROM HERE *****
+ var revert = false;
+
+ try
{
+ var revertFile = new System.IO.FileInfo(@"c:\revertputtunerequest.txt");
+
+ if (revertFile.Exists)
+ revert = true;
+
+ if (revert)
+ Log.Log.WriteFile("dvb:Reverting put_tuneRequest error catch to pre-1.2.0 beta");
+ }
+ catch (Exception)
+ {
+ // Make sure no new errors are introduced
+ }
+
+ if ((!revert && hr < 0) || (revert && hr != 0))
+
+ // ***** TO HERE *****
+ // AND uncomment this line:
+ // if(hr < 0)
+ {
Log.Log.WriteFile("dvb:SubmitTuneRequest returns:0x{0:X} - {1}{2}", hr, HResult.GetDXErrorString(hr),
DsError.GetErrorText(hr));
throw new TvException("Unable to tune to channel");
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvDvbChannel.cs
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvDvbChannel.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvDvbChannel.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -64,6 +64,16 @@
protected int _pmtPid = -1;
/// <summary>
+ /// PMT data
+ /// </summary>
+ protected byte[] _pmtData;
+
+ /// <summary>
+ /// PMT data length
+ /// </summary>
+ protected int _pmtLength;
+
+ /// <summary>
/// Channel Info
/// </summary>
protected ChannelInfo _channelInfo;
@@ -91,29 +101,32 @@
/// set to true to enable PAT lookup of PMT
private bool alwaysUsePATLookup = DebugSettings.UsePATLookup;
- #region teletext
-
- private int _pmtLength;
- private byte[] _pmtData;
-
#endregion
- #endregion
-
#region events
- private ManualResetEvent _eventPMT; // gets signaled when PMT arrives
- private ManualResetEvent _eventCA; // gets signaled when CA arrives
+ /// <summary>
+ /// Event that gets signaled when PMT arrives.
+ /// </summary>
+ protected ManualResetEvent _eventPMT;
+ /// <summary>
+ /// Event that gets signaled when CA arrives.
+ /// </summary>
+ private ManualResetEvent _eventCA;
+
#endregion
#region graph variables
private readonly ConditionalAccess _conditionalAccess;
private readonly IBaseFilter _filterTIF;
- private readonly IBaseFilter _filterTsWriter;
- private readonly IFilterGraph2 _graphBuilder;
+ /// <summary>
+ /// The graph builder for the capture card graph.
+ /// </summary>
+ protected IFilterGraph2 _graphBuilder;
+
#endregion
#endregion
@@ -134,7 +147,6 @@
_tsHelper = new TSHelperTools();
_channelInfo = new ChannelInfo();
_pmtPid = -1;
- _parameters = new ScanParameters();
_subChannelId = 0;
_timeshiftFileName = "";
_recordingFileName = "";
@@ -163,19 +175,17 @@
_conditionalAccess = ca;
_mdplugs = mdplugs;
_filterTIF = tif;
- _filterTsWriter = tsWriter;
_teletextDecoder = new DVBTeletext();
_packetHeader = new TSHelperTools.TSHeader();
_tsHelper = new TSHelperTools();
_channelInfo = new ChannelInfo();
_pmtPid = -1;
_subChannelIndex = -1;
- _tsFilterInterface = (ITsFilter)_filterTsWriter;
+ _tsFilterInterface = (ITsFilter)tsWriter;
_tsFilterInterface.AddChannel(ref _subChannelIndex);
Log.Log.WriteFile("TvDvbChannel ctor new subchIndex:{0}", _subChannelIndex);
- _parameters = new ScanParameters();
_subChannelId = subChannelId;
_conditionalAccess.AddSubChannel(_subChannelId, channel);
_timeshiftFileName = "";
@@ -211,12 +221,9 @@
public override void OnBeforeTune()
{
Log.Log.WriteFile("subch:{0} OnBeforeTune", _subChannelId);
- if (IsTimeShifting)
+ if (IsTimeShifting && _subChannelIndex >= 0)
{
- if (_subChannelIndex >= 0)
- {
- _tsFilterInterface.TimeShiftPause(_subChannelIndex, 1);
- }
+ _tsFilterInterface.TimeShiftPause(_subChannelIndex, 1);
}
_startTimeShifting = false;
_startRecording = false;
@@ -232,26 +239,33 @@
public override void OnAfterTune()
{
Log.Log.WriteFile("subch:{0} OnAfterTune", _subChannelId);
- List<ushort> pids = new List<ushort>();
- pids.Add(0x0); //pat
- pids.Add(0x11); //sdt
- pids.Add(0x1fff); //padding stream
- if (_currentChannel != null)
+ if (_conditionalAccess != null)
{
- DVBBaseChannel ch = (DVBBaseChannel)_currentChannel;
- if (ch.PmtPid > 0)
+ List<ushort> pids = new List<ushort>();
+ pids.Add(0x0); //pat
+ pids.Add(0x11); //sdt
+ pids.Add(0x1fff); //padding stream
+ if (_currentChannel != null)
{
- pids.Add((ushort)ch.PmtPid); //sdt
+ DVBBaseChannel ch = (DVBBaseChannel) _currentChannel;
+ if (ch.PmtPid > 0)
+ {
+ pids.Add((ushort) ch.PmtPid); //sdt
+ }
}
+
+ _conditionalAccess.SendPids(_subChannelId, (DVBBaseChannel) _currentChannel, pids);
}
- _conditionalAccess.SendPids(_subChannelId, (DVBBaseChannel)_currentChannel, pids);
-
_pmtPid = -1;
_pmtVersion = -1;
}
- private bool WaitForPMT()
+ /// <summary>
+ /// Wait for PMT to be found in the transport stream.
+ /// </summary>
+ /// <returns><c>true</c> if PMT was found, otherwise <c>false</c></returns>
+ protected virtual bool WaitForPMT()
{
bool foundPMT = false;
int retryCount = 0;
@@ -418,7 +432,9 @@
else
{
if (_teletextDecoder != null)
+ {
_teletextDecoder.ClearBuffer();
+ }
_pmtPid = -1;
_pmtVersion = -1;
@@ -463,6 +479,7 @@
_startTimeShifting = false;
_startRecording = false;
_pmtVersion = -1;
+ _timeshiftFileName = "";
_recordingFileName = "";
_channelInfo = new ChannelInfo();
_currentChannel = null;
@@ -502,7 +519,7 @@
Log.Log.WriteFile("subch:{0} StartRecord({1})", _subChannelId, fileName);
if (_tsFilterInterface != null)
{
- int hr = _tsFilterInterface.RecordSetRecordingFileName(_subChannelIndex, fileName);
+ int hr = _tsFilterInterface.RecordSetRecordingFileNameW(_subChannelIndex, fileName);
if (hr != 0)
{
Log.Log.Error("subch:{0} SetRecordingFileName failed:{1:X}", _subChannelId, hr);
@@ -526,7 +543,6 @@
{
Log.Log.Error("subch:{0} tswriter StartRecord failed:{1:X}", _subChannelId, hr);
}
- _graphState = GraphState.Recording;
}
}
}
@@ -545,7 +561,6 @@
Log.Log.WriteFile("tvdvbchannel.OnStopRecording subch:{0}-{1} tswriter StopRecording...", _subChannelId,
_subChannelIndex);
_tsFilterInterface.RecordStopRecord(_subChannelIndex);
- _graphState = _timeshiftFileName != "" ? GraphState.TimeShifting : GraphState.Created;
}
}
else
@@ -576,7 +591,7 @@
_tsFilterInterface.SetVideoAudioObserver(_subChannelIndex, this);
_tsFilterInterface.TimeShiftSetParams(_subChannelIndex, _parameters.MinimumFiles, _parameters.MaximumFiles,
_parameters.MaximumFileSize);
- _tsFilterInterface.TimeShiftSetTimeShiftingFileName(_subChannelIndex, fileName);
+ _tsFilterInterface.TimeShiftSetTimeShiftingFileNameW(_subChannelIndex, fileName);
if (CurrentChannel == null)
{
@@ -604,16 +619,14 @@
/// <returns></returns>
protected override void OnStopTimeShifting()
{
- if (_timeshiftFileName != "")
+ if (IsTimeShifting)
{
Log.Log.WriteFile("subch:{0}-{1} tswriter StopTimeshifting...", _subChannelId, _subChannelIndex);
if (_tsFilterInterface != null)
{
_tsFilterInterface.TimeShiftStop(_subChannelIndex);
}
- _graphState = GraphState.Created;
}
- _timeshiftFileName = "";
}
/// <summary>
@@ -829,7 +842,10 @@
_tsFilterInterface.DeleteChannel(_subChannelIndex);
_subChannelIndex = -1;
}
- _conditionalAccess.FreeSubChannel(_subChannelId);
+ if (_conditionalAccess != null)
+ {
+ _conditionalAccess.FreeSubChannel(_subChannelId);
+ }
}
#endregion
@@ -895,7 +911,7 @@
Log.Log.WriteFile("subch:{0} pid:{1:X} pcr", _subChannelId, info.pcrPid);
Log.Log.WriteFile("subch:{0} pid:{1:X} pmt", _subChannelId, info.network_pmt_PID);
- if (info.network_pmt_PID >= 0 && ((DVBBaseChannel)_currentChannel).ServiceId >= 0)
+ if (info.network_pmt_PID >= 0 && info.serviceID >= 0)
{
hwPids.Add((ushort)info.network_pmt_PID);
}
@@ -991,7 +1007,7 @@
Log.Log.WriteFile("Number of HWPIDS that needs to be sent to tuner :{0} ", hwPids.Count);
}
- if (info.network_pmt_PID >= 0 && ((DVBBaseChannel)_currentChannel).ServiceId >= 0)
+ if (_conditionalAccess != null && info.network_pmt_PID >= 0 && info.serviceID >= 0)
{
_conditionalAccess.SendPids(_subChannelId, (DVBBaseChannel)_currentChannel, hwPids);
}
@@ -1046,7 +1062,7 @@
/// <summary>
/// Sets the pids for the timeshifter
/// </summary>
- private void SetTimeShiftPids()
+ protected virtual void SetTimeShiftPids()
{
//Log.Log.WriteFile("SetTimeShiftPids new DLL");
if (_channelInfo == null)
@@ -1056,14 +1072,11 @@
if (_currentChannel == null)
return;
//if (_currentAudioStream == null) return;
- DVBBaseChannel dvbChannel = _currentChannel as DVBBaseChannel;
- if (dvbChannel == null)
- return;
try
{
_tsFilterInterface.TimeShiftPause(_subChannelIndex, 1);
- _tsFilterInterface.TimeShiftSetPmtPid(_subChannelIndex, dvbChannel.PmtPid, dvbChannel.ServiceId, _pmtData,
+ _tsFilterInterface.TimeShiftSetPmtPid(_subChannelIndex, _channelInfo.network_pmt_PID, _channelInfo.serviceID, _pmtData,
_pmtLength);
//_linkageScannerEnabled = (layer.GetSetting("linkageScannerEnabled", "no").Value == "yes");
@@ -1080,7 +1093,7 @@
/// <summary>
/// Sets the pids for the recorder
/// </summary>
- private void SetRecorderPids()
+ protected void SetRecorderPids()
{
Log.Log.WriteFile("SetRecorderPids");
if (_channelInfo == null)
@@ -1091,22 +1104,18 @@
return;
if (_currentAudioStream == null)
return;
- DVBBaseChannel dvbChannel = _currentChannel as DVBBaseChannel;
- if (dvbChannel == null)
- return;
- if (dvbChannel.PmtPid > 0)
+ if (_channelInfo.network_pmt_PID > 0)
{
- _tsFilterInterface.RecordSetPmtPid(_subChannelIndex, dvbChannel.PmtPid, dvbChannel.ServiceId, _pmtData,
+ _tsFilterInterface.RecordSetPmtPid(_subChannelIndex, _channelInfo.network_pmt_PID, _channelInfo.serviceID, _pmtData,
_pmtLength);
}
- _dateRecordingStarted = DateTime.Now;
}
/// <summary>
/// Decodes the PMT and sends the PMT to cam.
/// </summary>
- protected bool SendPmtToCam(out bool updatePids, out int waitInterval)
+ protected virtual bool SendPmtToCam(out bool updatePids, out int waitInterval)
{
lock (this)
{
@@ -1168,6 +1177,7 @@
_channelInfo = new ChannelInfo();
_channelInfo.DecodePmt(_pmtData);
_channelInfo.network_pmt_PID = channel.PmtPid;
+ _channelInfo.serviceID = channel.ServiceId;
// update any service scrambled / unscambled changes
if (_channelInfo.scrambled == channel.FreeToAir)
@@ -1248,7 +1258,7 @@
#endregion
- #region properties
+ #region properties
/// <summary>
/// Fetches the stream quality information
@@ -1284,6 +1294,10 @@
}
}
+ /// <summary>
+ /// Indicates whether PMT has been received for the current subchannel or not.
+ /// </summary>
+ /// <value><c>true</c> if PMT has been received, otherwise <c>false</c></value>
public bool PMTreceived
{
get { return (_pmtVersion > -1 && _channelInfo.pids.Count > 0); }
@@ -1317,7 +1331,7 @@
/// Called when tswriter.ax has received a new pmt
/// </summary>
/// <returns></returns>
- public int OnPMTReceived(int pmtPid)
+ public virtual int OnPMTReceived(int pmtPid)
{
if (_eventPMT != null)
{
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/TvCardCollection.cs
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/TvCardCollection.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Implementations/TvCardCollection.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -120,16 +120,22 @@
}
}
}
- //Hauppauge HD PVR
+ //Hauppauge HD PVR & Colossus
devices = DsDevice.GetDevicesOfCat(FilterCategory.AMKSCrossbar);
for (int i = 0; i < devices.Length; ++i)
{
- if (String.Compare(devices[i].Name, "Hauppauge HD PVR Crossbar", true) == 0)
+ if (devices[i].Name.Equals("Hauppauge HD PVR Crossbar"))
{
Log.Log.WriteFile("Detected Hauppauge HD PVR");
TvCardHDPVR card = new TvCardHDPVR(devices[i]);
_cards.Add(card);
}
+ else if (devices[i].Name.Contains("Hauppauge Colossus Crossbar"))
+ {
+ Log.Log.WriteFile("Detected Hauppauge Colossus");
+ TvCardHDPVR card = new TvCardHDPVR(devices[i]);
+ _cards.Add(card);
+ }
}
//BDA TV devices
devices = DsDevice.GetDevicesOfCat(FilterCategory.BDASourceFiltersCategory);
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/IMPRecord.cs
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/IMPRecord.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/IMPRecord.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -38,7 +38,7 @@
/// <param name="fileName">Name of the file.</param>
/// <returns></returns>
[PreserveSig]
- int SetRecordingFileName(int subChannelId, [In, MarshalAs(UnmanagedType.LPStr)] string fileName);
+ int SetRecordingFileNameW(int subChannelId, [In, MarshalAs(UnmanagedType.LPWStr)] string fileName);
/// <summary>
/// Starts recording.
@@ -78,7 +78,7 @@
/// <param name="fileName">Name of the file.</param>
/// <returns></returns>
[PreserveSig]
- int SetTimeShiftFileName(int subChannelId, [In, MarshalAs(UnmanagedType.LPStr)] string fileName);
+ int SetTimeShiftFileNameW(int subChannelId, [In, MarshalAs(UnmanagedType.LPWStr)] string fileName);
/// <summary>
/// Starts time shifting.
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/ITsFilter.cs
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/ITsFilter.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/ITsFilter.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -145,13 +145,13 @@
int PmtGetPMTData(int handle, IntPtr pmtData);
/// <summary>
- /// Sets the recorder filename for the given sub channel
+ /// Sets the recorder unicode filename for the given subchannel
/// </summary>
/// <param name="handle">Handle of the sub channel</param>
- /// <param name="fileName">Filename for the reocrding</param>
+ /// <param name="fileName">Filename for the recording</param>
/// <returns></returns>
[PreserveSig]
- int RecordSetRecordingFileName(int handle, [In, MarshalAs(UnmanagedType.LPStr)] string fileName);
+ int RecordSetRecordingFileNameW(int handle, [In, MarshalAs(UnmanagedType.LPWStr)] string fileName);
/// <summary>
/// Starts recording on the given sub channel
@@ -198,7 +198,7 @@
/// <param name="fileName">Filename</param>
/// <returns></returns>
[PreserveSig]
- int TimeShiftSetTimeShiftingFileName(int handle, [In, MarshalAs(UnmanagedType.LPStr)] string fileName);
+ int TimeShiftSetTimeShiftingFileNameW(int handle, [In, MarshalAs(UnmanagedType.LPWStr)] string fileName);
/// <summary>
/// Starts timeshifting on the given sub channel
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/ITsRecorder.cs
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/ITsRecorder.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/ITsRecorder.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -35,7 +35,7 @@
/// </summary>
/// <returns></returns>
[PreserveSig]
- int SetRecordingFileName([In, MarshalAs(UnmanagedType.LPStr)] string fileName);
+ int SetRecordingFileNameW([In, MarshalAs(UnmanagedType.LPWStr)] string fileName);
/// <summary>
/// Starts recording.
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/ItsTimeshift.cs
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/ItsTimeshift.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Interfaces/Analyzer/ItsTimeshift.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -36,7 +36,7 @@
///<param name="fileName">Filename</param>
///<returns>Error code</returns>
[PreserveSig]
- int SetTimeShiftingFileName([In, MarshalAs(UnmanagedType.LPStr)] string fileName);
+ int SetTimeShiftingFileNameW([In, MarshalAs(UnmanagedType.LPWStr)] string fileName);
/// <summary>
/// Starts timeshifting.
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Streaming/RtspStreaming.cs
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Streaming/RtspStreaming.cs 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVLibrary/Streaming/RtspStreaming.cs 2011-04-22 02:24:20 UTC (rev 27823)
@@ -45,11 +45,15 @@
private static extern void StreamRun();
[DllImport("StreamingServer.dll", CharSet = CharSet.Ansi)]
- private static extern void StreamAddTimeShiftFile(string streamName, string fileName, bool isProgramStream,
+ private static extern void StreamAddTimeShiftFile(string streamName,
+ [In, MarshalAs(UnmanagedType.LPWStr)] string fileName,
+ bool isProgramStream,
int channelType);
[DllImport("StreamingServer.dll", CharSet = CharSet.Ansi)]
- private static extern void StreamAddMpegFile(string streamName, string fileName, int channelType);
+ private static extern void StreamAddMpegFile(string streamName,
+ [In, MarshalAs(UnmanagedType.LPWStr)] string fileName,
+ int channelType);
[DllImport("StreamingServer.dll", CharSet = CharSet.Ansi)]
private static extern void StreamRemove(string streamName);
Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem G?\195?\182teborg.xml
===================================================================
svnlook: Can't convert string from 'UTF-8' to native encoding:
svnlook: --- branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem G?\195?\182teborg.xml 2011-04-21 17:31:44 UTC (rev 27822)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem G?\195?\182teborg.xml 2011-04-22 02:24:20 UTC (rev 27823)
|
|
From: <flokel@su...> - 2011-04-21 17:31:52
|
Author: flokel
Date: 2011-04-21 19:31:44 +0200 (Thu, 21 Apr 2011)
New Revision: 27822
Modified:
trunk/mediaportal/MediaPortal.Base/language/strings_sv.xml
Log:
update for swedish translation
Modified: trunk/mediaportal/MediaPortal.Base/language/strings_sv.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/language/strings_sv.xml 2011-04-21 17:29:10 UTC (rev 27821)
+++ trunk/mediaportal/MediaPortal.Base/language/strings_sv.xml 2011-04-21 17:31:44 UTC (rev 27822)
@@ -802,7 +802,7 @@
<String id="916">Fjärrfil</String>
<String id="917">Denna fil finns i en fjärrmapp</String>
<String id="918">Vill du ladda ner det till din vanliga</String>
- <String id="919">lokala share?</String>
+ <String id="919">lokal utdelning?</String>
<String id="920">Kunde inte ladda ner fjärrfil</String>
<String id="921">Filen laddas ner</String>
<String id="922">Beskrivning</String>
@@ -936,10 +936,6 @@
<String id="1054">(inspelning)</String>
<String id="1055">(timeshifting)</String>
<String id="1056">(ej tillgänglig)</String>
- <String id="1057">Spela in Sön-Tors</String>
- <String id="1058">Spela in Fre-Lör</String>
- <String id="1059">Sön-Tor</String>
- <String id="1060">Fre-Lör</String>
<String id="1061">Flyttbar</String>
<String id="1062">Objekt</String>
<String id="1064">Bokmärken</String>
@@ -997,7 +993,22 @@
<String id="1203">Kommande avsnitt (aktiva:{0})</String>
<String id="1204">Spela alla filmer i vald mapp</String>
<String id="1205">Sortering: Disknr</String>
+ <String id="1206">Programmet spelas i {0} minuter</String>
+ <String id="1207">Växla till {0} nu?</String>
+ <String id="1208">Sortera efter kompositör</String>
<String id="1211">Återuppta uppspelning från {0}</String>
+ <String id="1212">Ta bort påminnelse</String>
+ <String id="1213">Lyssna ttill denna station</String>
+ <String id="1214">Kompositörer</String>
+ <String id="1215">Ledare</String>
+ <String id="1216">Skivor</String>
+ <String id="1217">Artistspår</String>
+ <String id="1218">Album i åldersordning</String>
+ <String id="1219">Album Artister (Index)</String>
+ <String id="1220">Sortera efter skapandedatum</String>
+ <String id="1221">Sortera efter ändradatum</String>
+ <String id="1230">Tillagd datum:</String>
+ <String id="1231">Senast spelad:</String>
<String id="1300" prefix="Mina ">TV-serier</String>
<String id="1440" prefix="Min ">Text-TV</String>
<String id="1441">Text-TV</String>
@@ -1667,7 +1678,7 @@
<String id="33031">Andra låtar med etikett:</String>
<String id="33032">Detta albums bästa låt kunde inte</String>
<String id="33033">hittas i din samling!</String>
- <String id="33040">Copy now playing spam to clipboard</String>
+ <String id="33040">Kopiera skräp som spelas nu till klippbordet</String>
<String id="33041">Lägg till detta album till spellistan</String>
<String id="34000" prefix="Min">Last.fm</String>
<String id="34001">Starta / byt ström</String>
@@ -1753,8 +1764,8 @@
<String id="100505" prefix="Min ">Musik/top100</String>
<String id="100506" prefix="Min ">Musik/Favoriter</String>
<String id="100507" prefix="Min ">Musik/Ã…r</String>
- <String id="100508" prefix="Min ">Musik/Lookup/Resultat</String>
- <String id="100509" prefix="Min ">Musik/Lookup/Progress</String>
+ <String id="100508" prefix="Min ">Musik/Sökning/Resultat</String>
+ <String id="100509" prefix="Min ">Musik/Sökning/Förlopp</String>
<String id="100510" prefix="Min ">Musik/Nu spelas</String>
<String id="100511" prefix="Min ">Musik/Fullskärm</String>
<String id="100512">LastFM Älska/Hata</String>
@@ -1818,6 +1829,7 @@
<String id="100760" prefix="Min ">Brännare</String>
<String id="100761" prefix="Min ">TV-tablå</String>
<String id="100762" prefix="Min ">Radio-tablå</String>
+ <String id="100763">Inspelad radio</String>
<String id="100800" prefix="Mina">Tillägg</String>
<String id="101000">tangentbord</String>
<String id="101002">Virtuellt standardtangentbord</String>
@@ -1840,6 +1852,7 @@
<String id="102014">Bildinfo</String>
<String id="102015">Minimeny</String>
<String id="102016">Upplysning</String>
+ <String id="102017">Inspelningskonflikt</String>
<String id="102018">CI meny</String>
<String id="102600" prefix="Mitt">Väder</String>
<String id="102700" prefix="Mina">Nyheter</String>
@@ -1869,6 +1882,7 @@
<String id="109004">MiniDisplay - Inställningar - Equalizer</String>
<String id="109005">MiniDisplay - Inställningar - Tangentbord</String>
<String id="109006">MiniDisplay - Inställningar - Fjärrkontroll</String>
+ <String id="102019">TV-påminnelse</String>
<String id="200000">Var god ange vilken EPG grabber du använder. Om ditt land inte</String>
<String id="200001">finns med i listan måste du tillföra EPG:n manuellt</String>
<String id="200002">Nu kan du mappa EPG-kanalerna till dina TV-kanaler</String>
|
|
From: <flokel@su...> - 2011-04-21 17:29:17
|
Author: flokel
Date: 2011-04-21 19:29:10 +0200 (Thu, 21 Apr 2011)
New Revision: 27821
Modified:
trunk/mediaportal/MediaPortal.Base/language/strings_tr.xml
Log:
update for turkish translation
Modified: trunk/mediaportal/MediaPortal.Base/language/strings_tr.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/language/strings_tr.xml 2011-04-20 17:07:27 UTC (rev 27820)
+++ trunk/mediaportal/MediaPortal.Base/language/strings_tr.xml 2011-04-21 17:29:10 UTC (rev 27821)
@@ -999,6 +999,12 @@
<String id="1211">Oynatmaya {0}'dan devam et</String>
<String id="1212">Hatırlatmayı iptal et</String>
<String id="1213">Bu Ä°stasyonu Dinle</String>
+ <String id="1214">Besteciler</String>
+ <String id="1215">Orkestra Åžefleri</String>
+ <String id="1216">Diskler</String>
+ <String id="1217">Sanatçı Parçaları</String>
+ <String id="1218">Yaşa Göre Albümler</String>
+ <String id="1219">Albüm Sanatçıları (İndeks)</String>
<String id="1220">Sıralama: Oluşturulma Tarihi</String>
<String id="1221">Sıralama: Değiştirilme Tarihi</String>
<String id="1230">Eklenme tarihi:</String>
@@ -1846,6 +1852,7 @@
<String id="102014">Resim bilgisi</String>
<String id="102015">Mini menü</String>
<String id="102016">Bilgilendirme</String>
+ <String id="102017">Kayıt Çakışması</String>
<String id="102018">CI menüsü</String>
<String id="102600">Hava Durumu</String>
<String id="102700">Haberler</String>
|
|
From: <catavolt@su...> - 2011-04-20 17:07:37
|
Author: catavolt
Date: 2011-04-20 19:07:27 +0200 (Wed, 20 Apr 2011)
New Revision: 27820
Modified:
trunk/mediaportal/MediaPortal.Base/skin/Default/BasicHome.xml
trunk/mediaportal/MediaPortal.Base/skin/Default/BasicHomeExtraInfos.xml
trunk/mediaportal/MediaPortal.Base/skin/Default/musicOverlay.xml
trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHome.xml
trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHomeExtraInfos.xml
trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/musicOverlay.xml
Log:
Added visibility check for enabled recently added items in FH.
Fixed small bug in BasicHome.xmls and musicOverlay.xmls regarding display of missing coverart.
Modified: trunk/mediaportal/MediaPortal.Base/skin/Default/BasicHome.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/skin/Default/BasicHome.xml 2011-04-19 16:23:58 UTC (rev 27819)
+++ trunk/mediaportal/MediaPortal.Base/skin/Default/BasicHome.xml 2011-04-20 17:07:27 UTC (rev 27820)
@@ -506,7 +506,7 @@
<keepaspectratio>no</keepaspectratio>
<centered>yes</centered>
<texture mask="picturethumbmask.png">missing_coverart.png</texture>
- <visible>Player.HasAudio+!Player.HasVideo+!control.hasthumb(31)|!control.hasthumb(77)</visible>
+ <visible>Player.HasAudio+!Player.HasVideo+![control.hasthumb(31)|control.hasthumb(77)]</visible>
</control>
<control>
<description>music logo</description>
Modified: trunk/mediaportal/MediaPortal.Base/skin/Default/BasicHomeExtraInfos.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/skin/Default/BasicHomeExtraInfos.xml 2011-04-19 16:23:58 UTC (rev 27819)
+++ trunk/mediaportal/MediaPortal.Base/skin/Default/BasicHomeExtraInfos.xml 2011-04-20 17:07:27 UTC (rev 27820)
@@ -18,7 +18,7 @@
<height>93</height>
<texture>list_sub_focus.png</texture>
<colordiffuse>ffffffff</colordiffuse>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Updates label</description>
@@ -30,7 +30,7 @@
<label>4558</label>
<align>left</align>
<font>font11</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -43,7 +43,7 @@
<height>0</height>
<texture>hbar1gainsboro.png</texture>
<colordiffuse>50ffffff</colordiffuse>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>TVSeries updates</description>
@@ -55,7 +55,7 @@
<label>#fanarthandler.tvseries.latest1.serieName - #fanarthandler.tvseries.latest1.seasonIndexx#fanarthandler.tvseries.latest1.episodeIndex: #fanarthandler.tvseries.latest1.episodeName (#fanarthandler.tvseries.latest1.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -68,7 +68,7 @@
<label>#fanarthandler.tvseries.latest2.serieName - #fanarthandler.tvseries.latest2.seasonIndexx#fanarthandler.tvseries.latest2.episodeIndex: #fanarthandler.tvseries.latest2.episodeName (#fanarthandler.tvseries.latest2.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -81,7 +81,7 @@
<label>#fanarthandler.tvseries.latest3.serieName - #fanarthandler.tvseries.latest3.seasonIndexx#fanarthandler.tvseries.latest3.episodeIndex: #fanarthandler.tvseries.latest3.episodeName (#fanarthandler.tvseries.latest3.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -95,7 +95,7 @@
<colordiffuse>ffffffff</colordiffuse>
<texture mask="Picturethumbmask.png">#fanarthandler.tvseries.latest1.serieThumb</texture>
<shouldCache>true</shouldCache>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Overlay Cover 1</description>
@@ -108,7 +108,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -122,7 +122,7 @@
<colordiffuse>ffffffff</colordiffuse>
<texture mask="Picturethumbmask.png">#fanarthandler.tvseries.latest2.serieThumb</texture>
<shouldCache>true</shouldCache>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Overlay Cover 2</description>
@@ -135,7 +135,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -149,7 +149,7 @@
<colordiffuse>ffffffff</colordiffuse>
<texture mask="Picturethumbmask.png">#fanarthandler.tvseries.latest3.serieThumb</texture>
<shouldCache>true</shouldCache>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Overlay Cover 3</description>
@@ -162,7 +162,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<!-- ******************************************************************************************* -->
@@ -178,7 +178,7 @@
<height>112</height>
<texture>list_sub_focus.png</texture>
<colordiffuse>80ffffff</colordiffuse>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest1.title)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Updates label</description>
@@ -190,7 +190,7 @@
<label>4558</label>
<align>left</align>
<font>font11</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -203,7 +203,7 @@
<height>0</height>
<texture>hbar1gainsboro.png</texture>
<colordiffuse>50ffffff</colordiffuse>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Moving Pictures updates</description>
@@ -215,7 +215,7 @@
<label>#fanarthandler.movingpicture.latest1.title - #fanarthandler.movingpicture.latest1.genre - #fanarthandler.movingpicture.latest1.runtime - #fanarthandler.movingpicture.latest1.year (#fanarthandler.movingpicture.latest1.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -228,7 +228,7 @@
<label>#fanarthandler.movingpicture.latest2.title - #fanarthandler.movingpicture.latest2.genre - #fanarthandler.movingpicture.latest2.runtime - #fanarthandler.movingpicture.latest2.year (#fanarthandler.movingpicture.latest2.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -241,7 +241,7 @@
<label>#fanarthandler.movingpicture.latest3.title - #fanarthandler.movingpicture.latest3.genre - #fanarthandler.movingpicture.latest3.runtime - #fanarthandler.movingpicture.latest3.year (#fanarthandler.movingpicture.latest3.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -255,7 +255,7 @@
<colordiffuse>ffffffff</colordiffuse>
<texture mask="Picturethumbmask.png">#fanarthandler.movingpicture.latest1.thumb</texture>
<shouldCache>true</shouldCache>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Overlay Cover 1</description>
@@ -268,7 +268,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -282,7 +282,7 @@
<colordiffuse>ffffffff</colordiffuse>
<texture mask="Picturethumbmask.png">#fanarthandler.movingpicture.latest2.thumb</texture>
<shouldCache>true</shouldCache>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Overlay Cover 2</description>
@@ -295,7 +295,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -309,7 +309,7 @@
<colordiffuse>ffffffff</colordiffuse>
<texture mask="Picturethumbmask.png">#fanarthandler.movingpicture.latest3.thumb</texture>
<shouldCache>true</shouldCache>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Overlay Cover 3</description>
@@ -322,7 +322,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<!-- ******************************************************************************************* -->
@@ -338,7 +338,7 @@
<height>112</height>
<texture>list_sub_focus.png</texture>
<colordiffuse>80ffffff</colordiffuse>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Updates label</description>
@@ -350,7 +350,7 @@
<label>4558</label>
<align>left</align>
<font>font11</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -363,7 +363,7 @@
<height>0</height>
<texture>hbar1gainsboro.png</texture>
<colordiffuse>50ffffff</colordiffuse>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>TVRecordings updates</description>
@@ -375,7 +375,7 @@
<label>#fanarthandler.tvrecordings.latest1.title - #fanarthandler.tvrecordings.latest1.genre (#fanarthandler.tvrecordings.latest1.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -388,7 +388,7 @@
<label>#fanarthandler.tvrecordings.latest2.title - #fanarthandler.tvrecordings.latest2.genre (#fanarthandler.tvrecordings.latest2.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -401,7 +401,7 @@
<label>#fanarthandler.tvrecordings.latest3.title - #fanarthandler.tvrecordings.latest3.genre (#fanarthandler.tvrecordings.latest3.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -416,7 +416,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -430,7 +430,7 @@
<texture mask="picturethumbmask.png">Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -445,7 +445,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -459,7 +459,7 @@
<texture mask="picturethumbmask.png">Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>TVRecordings Updates</description>
@@ -473,7 +473,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>TVRecordings Updates cover</description>
@@ -486,7 +486,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
</control>
<!-- ******************************************************************************************* -->
<!-- ************************* RECENTLY ADDED - MUSIC ************************************** -->
@@ -501,7 +501,7 @@
<height>112</height>
<texture>list_sub_focus.png</texture>
<colordiffuse>80ffffff</colordiffuse>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Updates label</description>
@@ -513,7 +513,7 @@
<label>4558</label>
<align>left</align>
<font>font11</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -526,7 +526,7 @@
<height>0</height>
<texture>hbar1gainsboro.png</texture>
<colordiffuse>50ffffff</colordiffuse>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Music updates</description>
@@ -538,7 +538,7 @@
<label>#fanarthandler.music.latest1.artist - #fanarthandler.music.latest1.album - (#fanarthandler.music.latest1.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -551,7 +551,7 @@
<label>#fanarthandler.music.latest2.artist - #fanarthandler.music.latest2.album - (#fanarthandler.music.latest2.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -564,7 +564,7 @@
<label>#fanarthandler.music.latest3.artist - #fanarthandler.music.latest3.album - (#fanarthandler.music.latest3.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -579,7 +579,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -593,7 +593,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -608,7 +608,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -622,7 +622,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Music Updates</description>
@@ -636,7 +636,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Music Updates cover</description>
@@ -649,7 +649,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
</control>
<!-- ******************************************************************************************* -->
<!-- ************************* RECENTLY ADDED - PICTURES *********************************** -->
@@ -664,7 +664,7 @@
<height>112</height>
<texture>list_sub_focus.png</texture>
<colordiffuse>80ffffff</colordiffuse>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Updates label</description>
@@ -676,7 +676,7 @@
<label>4558</label>
<align>left</align>
<font>font11</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -689,7 +689,7 @@
<height>0</height>
<texture>hbar1gainsboro.png</texture>
<colordiffuse>50ffffff</colordiffuse>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Pictures updates</description>
@@ -701,7 +701,7 @@
<label>#fanarthandler.picture.latest1.title (#fanarthandler.picture.latest1.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -714,7 +714,7 @@
<label>#fanarthandler.picture.latest2.title (#fanarthandler.picture.latest2.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -727,7 +727,7 @@
<label>#fanarthandler.picture.latest3.title (#fanarthandler.picture.latest3.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -742,7 +742,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -756,7 +756,7 @@
<texture mask="picturethumbmask.png">Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -771,7 +771,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -785,7 +785,7 @@
<texture mask="picturethumbmask.png">Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Pictures Updates</description>
@@ -799,7 +799,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Pictures Updates cover</description>
@@ -812,7 +812,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
</control>
<!-- ******************************************************************************************* -->
<!-- ************************* WEATHER INFO ON BASIC HOME ********************************** -->
Modified: trunk/mediaportal/MediaPortal.Base/skin/Default/musicOverlay.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/skin/Default/musicOverlay.xml 2011-04-19 16:23:58 UTC (rev 27819)
+++ trunk/mediaportal/MediaPortal.Base/skin/Default/musicOverlay.xml 2011-04-20 17:07:27 UTC (rev 27820)
@@ -25,7 +25,7 @@
<keepaspectratio>no</keepaspectratio>
<centered>yes</centered>
<texture mask="picturethumbmask.png">missing_coverart.png</texture>
- <visible>!control.hasthumb(87)|!control.hasthumb(86)</visible>
+ <visible>![control.hasthumb(87)|control.hasthumb(86)]</visible>
</control>
<control>
<description>music logo</description>
Modified: trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHome.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHome.xml 2011-04-19 16:23:58 UTC (rev 27819)
+++ trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHome.xml 2011-04-20 17:07:27 UTC (rev 27820)
@@ -505,7 +505,7 @@
<keepaspectratio>no</keepaspectratio>
<centered>yes</centered>
<texture mask="picturethumbmask.png">missing_coverart.png</texture>
- <visible>Player.HasAudio+!Player.HasVideo+!control.hasthumb(31)|!control.hasthumb(77)</visible>
+ <visible>Player.HasAudio+!Player.HasVideo+![control.hasthumb(31)|control.hasthumb(77)]</visible>
</control>
<control>
<description>music logo</description>
Modified: trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHomeExtraInfos.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHomeExtraInfos.xml 2011-04-19 16:23:58 UTC (rev 27819)
+++ trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHomeExtraInfos.xml 2011-04-20 17:07:27 UTC (rev 27820)
@@ -17,7 +17,7 @@
<height>117</height>
<texture>list_sub_focus.png</texture>
<colordiffuse>ffffffff</colordiffuse>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Updates label</description>
@@ -29,7 +29,7 @@
<label>4558</label>
<align>left</align>
<font>font11</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -42,7 +42,7 @@
<height>1</height>
<texture>hbar1gainsboro.png</texture>
<colordiffuse>50ffffff</colordiffuse>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>TVSeries updates</description>
@@ -54,7 +54,7 @@
<label>#fanarthandler.tvseries.latest1.serieName - #fanarthandler.tvseries.latest1.seasonIndexx#fanarthandler.tvseries.latest1.episodeIndex: #fanarthandler.tvseries.latest1.episodeName (#fanarthandler.tvseries.latest1.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -67,7 +67,7 @@
<label>#fanarthandler.tvseries.latest2.serieName - #fanarthandler.tvseries.latest2.seasonIndexx#fanarthandler.tvseries.latest2.episodeIndex: #fanarthandler.tvseries.latest2.episodeName (#fanarthandler.tvseries.latest2.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -80,7 +80,7 @@
<label>#fanarthandler.tvseries.latest3.serieName - #fanarthandler.tvseries.latest3.seasonIndexx#fanarthandler.tvseries.latest3.episodeIndex: #fanarthandler.tvseries.latest3.episodeName (#fanarthandler.tvseries.latest3.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -94,7 +94,7 @@
<colordiffuse>ffffffff</colordiffuse>
<texture mask="Picturethumbmask.png">#fanarthandler.tvseries.latest1.serieThumb</texture>
<shouldCache>true</shouldCache>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Overlay Cover 1</description>
@@ -107,7 +107,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -121,7 +121,7 @@
<colordiffuse>ffffffff</colordiffuse>
<texture mask="Picturethumbmask.png">#fanarthandler.tvseries.latest2.serieThumb</texture>
<shouldCache>true</shouldCache>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Overlay Cover 2</description>
@@ -134,7 +134,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -148,7 +148,7 @@
<colordiffuse>ffffffff</colordiffuse>
<texture mask="Picturethumbmask.png">#fanarthandler.tvseries.latest3.serieThumb</texture>
<shouldCache>true</shouldCache>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Overlay Cover 3</description>
@@ -161,7 +161,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)</visible>
+ <visible>plugin.isenabled(Fanart Handler)+control.hasfocus(212)+plugin.isenabled(MP-TV Series)+string.equals(#fanarthandler.tvseries.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<!-- ******************************************************************************************* -->
@@ -177,7 +177,7 @@
<height>140</height>
<texture>list_sub_focus.png</texture>
<colordiffuse>80ffffff</colordiffuse>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest1.title)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Updates label</description>
@@ -189,7 +189,7 @@
<label>4558</label>
<align>left</align>
<font>font11</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -202,7 +202,7 @@
<height>1</height>
<texture>hbar1gainsboro.png</texture>
<colordiffuse>50ffffff</colordiffuse>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Moving Pictures updates</description>
@@ -214,7 +214,7 @@
<label>#fanarthandler.movingpicture.latest1.title - #fanarthandler.movingpicture.latest1.genre - #fanarthandler.movingpicture.latest1.runtime - #fanarthandler.movingpicture.latest1.year (#fanarthandler.movingpicture.latest1.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -227,7 +227,7 @@
<label>#fanarthandler.movingpicture.latest2.title - #fanarthandler.movingpicture.latest2.genre - #fanarthandler.movingpicture.latest2.runtime - #fanarthandler.movingpicture.latest2.year (#fanarthandler.movingpicture.latest2.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -240,7 +240,7 @@
<label>#fanarthandler.movingpicture.latest3.title - #fanarthandler.movingpicture.latest3.genre - #fanarthandler.movingpicture.latest3.runtime - #fanarthandler.movingpicture.latest3.year (#fanarthandler.movingpicture.latest3.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -254,7 +254,7 @@
<colordiffuse>ffffffff</colordiffuse>
<texture mask="Picturethumbmask.png">#fanarthandler.movingpicture.latest1.thumb</texture>
<shouldCache>true</shouldCache>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Overlay Cover 1</description>
@@ -267,7 +267,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -281,7 +281,7 @@
<colordiffuse>ffffffff</colordiffuse>
<texture mask="Picturethumbmask.png">#fanarthandler.movingpicture.latest2.thumb</texture>
<shouldCache>true</shouldCache>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Overlay Cover 2</description>
@@ -294,7 +294,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -308,7 +308,7 @@
<colordiffuse>ffffffff</colordiffuse>
<texture mask="Picturethumbmask.png">#fanarthandler.movingpicture.latest3.thumb</texture>
<shouldCache>true</shouldCache>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Overlay Cover 3</description>
@@ -321,7 +321,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>plugin.isenabled(Moving Pictures)+control.hasfocus(4)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.movingpicture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<!-- ******************************************************************************************* -->
@@ -337,7 +337,7 @@
<height>140</height>
<texture>list_sub_focus.png</texture>
<colordiffuse>80ffffff</colordiffuse>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Updates label</description>
@@ -349,7 +349,7 @@
<label>4558</label>
<align>left</align>
<font>font11</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -362,7 +362,7 @@
<height>1</height>
<texture>hbar1gainsboro.png</texture>
<colordiffuse>50ffffff</colordiffuse>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>TVRecordings updates</description>
@@ -374,7 +374,7 @@
<label>#fanarthandler.tvrecordings.latest1.title - #fanarthandler.tvrecordings.latest1.genre (#fanarthandler.tvrecordings.latest1.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -387,7 +387,7 @@
<label>#fanarthandler.tvrecordings.latest2.title - #fanarthandler.tvrecordings.latest2.genre (#fanarthandler.tvrecordings.latest2.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -400,7 +400,7 @@
<label>#fanarthandler.tvrecordings.latest3.title - #fanarthandler.tvrecordings.latest3.genre (#fanarthandler.tvrecordings.latest3.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -415,7 +415,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -429,7 +429,7 @@
<texture mask="picturethumbmask.png">Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -444,7 +444,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -458,7 +458,7 @@
<texture mask="picturethumbmask.png">Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>TVRecordings Updates</description>
@@ -472,7 +472,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>TVRecordings Updates cover</description>
@@ -485,7 +485,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(5)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.tvrecordings.latest.enabled,true)</visible>
</control>
<!-- ******************************************************************************************* -->
<!-- ************************* RECENTLY ADDED - MUSIC ************************************** -->
@@ -500,7 +500,7 @@
<height>140</height>
<texture>list_sub_focus.png</texture>
<colordiffuse>80ffffff</colordiffuse>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Updates label</description>
@@ -512,7 +512,7 @@
<label>4558</label>
<align>left</align>
<font>font11</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -525,7 +525,7 @@
<height>1</height>
<texture>hbar1gainsboro.png</texture>
<colordiffuse>50ffffff</colordiffuse>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Music updates</description>
@@ -537,7 +537,7 @@
<label>#fanarthandler.music.latest1.artist - #fanarthandler.music.latest1.album - (#fanarthandler.music.latest1.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -550,7 +550,7 @@
<label>#fanarthandler.music.latest2.artist - #fanarthandler.music.latest2.album - (#fanarthandler.music.latest2.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -563,7 +563,7 @@
<label>#fanarthandler.music.latest3.artist - #fanarthandler.music.latest3.album - (#fanarthandler.music.latest3.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -578,7 +578,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -592,7 +592,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -607,7 +607,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -621,7 +621,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Music Updates</description>
@@ -635,7 +635,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Music Updates cover</description>
@@ -648,7 +648,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(6)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.music.latest.enabled,true)</visible>
</control>
<!-- ******************************************************************************************* -->
<!-- ************************* RECENTLY ADDED - PICTURES *********************************** -->
@@ -663,7 +663,7 @@
<height>140</height>
<texture>list_sub_focus.png</texture>
<colordiffuse>80ffffff</colordiffuse>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Updates label</description>
@@ -675,7 +675,7 @@
<label>4558</label>
<align>left</align>
<font>font11</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -688,7 +688,7 @@
<height>1</height>
<texture>hbar1gainsboro.png</texture>
<colordiffuse>50ffffff</colordiffuse>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Pictures updates</description>
@@ -700,7 +700,7 @@
<label>#fanarthandler.picture.latest1.title (#fanarthandler.picture.latest1.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -713,7 +713,7 @@
<label>#fanarthandler.picture.latest2.title (#fanarthandler.picture.latest2.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -726,7 +726,7 @@
<label>#fanarthandler.picture.latest3.title (#fanarthandler.picture.latest3.dateAdded)</label>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -741,7 +741,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -755,7 +755,7 @@
<texture mask="picturethumbmask.png">Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -770,7 +770,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
<textcolor>gainsboro</textcolor>
</control>
<control Style="BasicHomeFade">
@@ -784,7 +784,7 @@
<texture mask="picturethumbmask.png">Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Pictures Updates</description>
@@ -798,7 +798,7 @@
<shouldCache>true</shouldCache>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
</control>
<control Style="BasicHomeFade">
<description>Pictures Updates cover</description>
@@ -811,7 +811,7 @@
<texture>Picturethumbframe.png</texture>
<align>left</align>
<font>font10</font>
- <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)</visible>
+ <visible>control.hasfocus(3)+plugin.isenabled(Fanart Handler)+string.equals(#fanarthandler.picture.latest.enabled,true)</visible>
</control>
<!-- ******************************************************************************************* -->
<!-- ************************* WEATHER INFO ON BASIC HOME ********************************** -->
Modified: trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/musicOverlay.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/musicOverlay.xml 2011-04-19 16:23:58 UTC (rev 27819)
+++ trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/musicOverlay.xml 2011-04-20 17:07:27 UTC (rev 27820)
@@ -36,7 +36,7 @@
<keepaspectratio>no</keepaspectratio>
<centered>yes</centered>
<texture mask="picturethumbmask.png">missing_coverart.png</texture>
- <visible>!control.hasthumb(87)|!control.hasthumb(86)</visible>
+ <visible>![control.hasthumb(87)|control.hasthumb(86)]</visible>
</control>
<control>
<description>music logo</description>
|
|
From: <catavolt@su...> - 2011-04-19 16:24:06
|
Author: catavolt
Date: 2011-04-19 18:23:58 +0200 (Tue, 19 Apr 2011)
New Revision: 27819
Modified:
trunk/mediaportal/MediaPortal.Base/skin/Default/BasicHome.xml
trunk/mediaportal/MediaPortal.Base/skin/Default/musicOverlay.xml
trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHome.xml
trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/musicOverlay.xml
Log:
Added missing coverart image to musicOverlay.xmls and BasicHome.xmls to show a default missing coverart when a music title don?\194?\180t have a thumb (otherwise only an empty cover overlay would be shown) ;)
Modified: trunk/mediaportal/MediaPortal.Base/skin/Default/BasicHome.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/skin/Default/BasicHome.xml 2011-04-19 15:16:57 UTC (rev 27818)
+++ trunk/mediaportal/MediaPortal.Base/skin/Default/BasicHome.xml 2011-04-19 16:23:58 UTC (rev 27819)
@@ -498,6 +498,19 @@
<control>
<description>music logo</description>
<type>image</type>
+ <id>1</id>
+ <posX>479</posX>
+ <posY>294</posY>
+ <width>64</width>
+ <height>64</height>
+ <keepaspectratio>no</keepaspectratio>
+ <centered>yes</centered>
+ <texture mask="picturethumbmask.png">missing_coverart.png</texture>
+ <visible>Player.HasAudio+!Player.HasVideo+!control.hasthumb(31)|!control.hasthumb(77)</visible>
+ </control>
+ <control>
+ <description>music logo</description>
+ <type>image</type>
<id>31</id>
<posX>479</posX>
<posY>294</posY>
Modified: trunk/mediaportal/MediaPortal.Base/skin/Default/musicOverlay.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/skin/Default/musicOverlay.xml 2011-04-19 15:16:57 UTC (rev 27818)
+++ trunk/mediaportal/MediaPortal.Base/skin/Default/musicOverlay.xml 2011-04-19 16:23:58 UTC (rev 27819)
@@ -17,6 +17,19 @@
<control>
<description>music logo</description>
<type>image</type>
+ <id>1</id>
+ <posX>67</posX>
+ <posY>456</posY>
+ <width>80</width>
+ <height>80</height>
+ <keepaspectratio>no</keepaspectratio>
+ <centered>yes</centered>
+ <texture mask="picturethumbmask.png">missing_coverart.png</texture>
+ <visible>!control.hasthumb(87)|!control.hasthumb(86)</visible>
+ </control>
+ <control>
+ <description>music logo</description>
+ <type>image</type>
<id>87</id>
<posX>67</posX>
<posY>456</posY>
Modified: trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHome.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHome.xml 2011-04-19 15:16:57 UTC (rev 27818)
+++ trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/BasicHome.xml 2011-04-19 16:23:58 UTC (rev 27819)
@@ -497,6 +497,19 @@
<control>
<description>music logo</description>
<type>image</type>
+ <id>1</id>
+ <posX>852</posX>
+ <posY>352</posY>
+ <width>115</width>
+ <height>115</height>
+ <keepaspectratio>no</keepaspectratio>
+ <centered>yes</centered>
+ <texture mask="picturethumbmask.png">missing_coverart.png</texture>
+ <visible>Player.HasAudio+!Player.HasVideo+!control.hasthumb(31)|!control.hasthumb(77)</visible>
+ </control>
+ <control>
+ <description>music logo</description>
+ <type>image</type>
<id>31</id>
<posX>852</posX>
<posY>352</posY>
@@ -594,6 +607,7 @@
<wrapString></wrapString>
<align>center</align>
<visible>Player.HasAudio+!Player.HasVideo</visible>
+ <animation effect="fade" time="400" condition="true">conditional</animation>
</control>
</controls>
</window>
Modified: trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/musicOverlay.xml
===================================================================
--- trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/musicOverlay.xml 2011-04-19 15:16:57 UTC (rev 27818)
+++ trunk/mediaportal/MediaPortal.Base/skin/DefaultWide/musicOverlay.xml 2011-04-19 16:23:58 UTC (rev 27819)
@@ -28,6 +28,19 @@
<control>
<description>music logo</description>
<type>image</type>
+ <id>1</id>
+ <posX>120</posX>
+ <posY>558</posY>
+ <width>115</width>
+ <height>115</height>
+ <keepaspectratio>no</keepaspectratio>
+ <centered>yes</centered>
+ <texture mask="picturethumbmask.png">missing_coverart.png</texture>
+ <visible>!control.hasthumb(87)|!control.hasthumb(86)</visible>
+ </control>
+ <control>
+ <description>music logo</description>
+ <type>image</type>
<id>87</id>
<posX>120</posX>
<posY>558</posY>
|