dsmyth-checkins Mailing List for DirectShow filters for MythTV
Brought to you by:
tobbej
Menu
▾
▴
dsmyth-checkins — cvs checkins
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(22) |
Sep
(7) |
Oct
(46) |
Nov
(29) |
Dec
(29) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(41) |
Feb
(25) |
Mar
(16) |
Apr
(16) |
May
(31) |
Jun
(9) |
Jul
(20) |
Aug
(16) |
Sep
(48) |
Oct
|
Nov
|
Dec
(6) |
| 2005 |
Jan
(2) |
Feb
(25) |
Mar
(16) |
Apr
(1) |
May
(62) |
Jun
(48) |
Jul
(28) |
Aug
(10) |
Sep
(25) |
Oct
(9) |
Nov
(27) |
Dec
(22) |
| 2006 |
Jan
(100) |
Feb
(12) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(12) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(19) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <to...@us...> - 2009-06-15 17:16:30
|
Revision: 569
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=569&view=rev
Author: tobbej
Date: 2009-06-15 17:16:21 +0000 (Mon, 15 Jun 2009)
Log Message:
-----------
Property Changed:
----------------
trunk/MythTVReader/Release/
Property changes on: trunk/MythTVReader/Release
___________________________________________________________________
Modified: svn:ignore
- *.exe
*.ilk
*.dll
*.pdb
*.exp
*.lib
mysqlpp
+ *.exe
*.ilk
*.dll
*.pdb
*.exp
*.lib
*.idb
mysqlpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2009-06-15 17:15:36
|
Revision: 568
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=568&view=rev
Author: tobbej
Date: 2009-06-15 17:15:24 +0000 (Mon, 15 Jun 2009)
Log Message:
-----------
Simple fix for another mysql query bug
Modified Paths:
--------------
trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp
Modified: trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp
===================================================================
--- trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp 2009-06-06 20:40:48 UTC (rev 567)
+++ trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp 2009-06-15 17:15:24 UTC (rev 568)
@@ -209,8 +209,9 @@
CAtlStringW producers;
mysqlpp::Row row;
- for(mysqlpp::Row::size_type i=0;row=res.at(i);++i)
+ for(mysqlpp::Row::size_type i=0;i<res.num_rows();++i)
{
+ row=res[i];
if(row["role"].compare("actor")==0)
{
actors+=CA2W(row["name"],CP_UTF8);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2009-06-06 20:42:17
|
Revision: 567
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=567&view=rev
Author: tobbej
Date: 2009-06-06 20:40:48 +0000 (Sat, 06 Jun 2009)
Log Message:
-----------
changes needed for the new version of mysql++
Modified Paths:
--------------
trunk/MythTVReader/Config/Config.vcproj
trunk/MythTVReader/Config/MySQLSettings.cpp
trunk/MythTVReader/DSMyth/DSMyth.vcproj
trunk/MythTVReader/MythSource/LiveTVChain.cpp
trunk/MythTVReader/MythSource/MythBackendComm.cpp
trunk/MythTVReader/MythSource/MythSource.vcproj
trunk/MythTVReader/MythTVReader.sln
trunk/MythTVReader/NuvConv/NuvConv.vcproj
trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp
trunk/MythTVReader/common/DBUtils.cpp
trunk/MythTVReader/common/ProgramInfo.cpp
trunk/MythTVReader/common/SeekTable.cpp
Property Changed:
----------------
trunk/MythTVReader/Debug/
trunk/MythTVReader/Release/
Modified: trunk/MythTVReader/Config/Config.vcproj
===================================================================
--- trunk/MythTVReader/Config/Config.vcproj 2009-06-06 20:09:50 UTC (rev 566)
+++ trunk/MythTVReader/Config/Config.vcproj 2009-06-06 20:40:48 UTC (rev 567)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="strmiids.lib libmysql.lib"
+ AdditionalDependencies="strmiids.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
@@ -151,7 +151,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="strmiids.lib libmysql.lib"
+ AdditionalDependencies="strmiids.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
Modified: trunk/MythTVReader/Config/MySQLSettings.cpp
===================================================================
--- trunk/MythTVReader/Config/MySQLSettings.cpp 2009-06-06 20:09:50 UTC (rev 566)
+++ trunk/MythTVReader/Config/MySQLSettings.cpp 2009-06-06 20:40:48 UTC (rev 567)
@@ -82,7 +82,7 @@
try
{
mysqlpp::Connection con(DBName,Host,User,Password);
- if(con.ping()!=0)
+ if(!con.ping())
{
ErrMsg="Failed to ping MySQL server";
return false;
Modified: trunk/MythTVReader/DSMyth/DSMyth.vcproj
===================================================================
--- trunk/MythTVReader/DSMyth/DSMyth.vcproj 2009-06-06 20:09:50 UTC (rev 566)
+++ trunk/MythTVReader/DSMyth/DSMyth.vcproj 2009-06-06 20:40:48 UTC (rev 567)
@@ -72,7 +72,7 @@
Name="VCLinkerTool"
RegisterOutput="true"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="strmiids.lib version.lib libmysql.lib ws2_32.lib quartz.lib"
+ AdditionalDependencies="strmiids.lib version.lib ws2_32.lib quartz.lib"
OutputFile="$(OutDir)/DSMyth.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""
@@ -164,7 +164,7 @@
Name="VCLinkerTool"
RegisterOutput="true"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="strmiids.lib version.lib libmysql.lib ws2_32.lib quartz.lib"
+ AdditionalDependencies="strmiids.lib version.lib ws2_32.lib quartz.lib"
OutputFile="$(OutDir)/DSMyth.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""
Property changes on: trunk/MythTVReader/Debug
___________________________________________________________________
Modified: svn:ignore
- *.exe
*.ilk
*.dll
*.pdb
*.exp
*.lib
+ *.exe
*.ilk
*.dll
*.pdb
*.exp
*.lib
*.idb
mysqlpp
Modified: trunk/MythTVReader/MythSource/LiveTVChain.cpp
===================================================================
--- trunk/MythTVReader/MythSource/LiveTVChain.cpp 2009-06-06 20:09:50 UTC (rev 566)
+++ trunk/MythTVReader/MythSource/LiveTVChain.cpp 2009-06-06 20:40:48 UTC (rev 567)
@@ -66,8 +66,8 @@
mysqlpp::Query query=con.query();
query << "DELETE FROM tvchain WHERE chainid = %0q";
query.parse();
- mysqlpp::ResNSel result=query.execute(m_id.GetBuffer());
- ATLASSERT(result.success && result.rows>0);
+ mysqlpp::SimpleResult result=query.execute(m_id.GetBuffer());
+ ATLASSERT(result.rows()>0);
}
catch(mysqlpp::Exception &e)
{
@@ -95,7 +95,7 @@
"WHERE chainid = %0q ORDER BY chainpos;";
query.parse();
- mysqlpp::Result res=query.store(m_id.GetBuffer());
+ mysqlpp::UseQueryResult res=query.use(m_id.GetBuffer());
if(res)
{
mysqlpp::Row row;
Modified: trunk/MythTVReader/MythSource/MythBackendComm.cpp
===================================================================
--- trunk/MythTVReader/MythSource/MythBackendComm.cpp 2009-06-06 20:09:50 UTC (rev 566)
+++ trunk/MythTVReader/MythSource/MythBackendComm.cpp 2009-06-06 20:40:48 UTC (rev 567)
@@ -792,8 +792,8 @@
"WHERE C.channum = %0q:channum "
"ORDER BY prio DESC";
query.parse();
- query.def["channum"]=channum;
- mysqlpp::Result res=query.store();
+ query.template_defaults["channum"]=channum.GetBuffer();
+ mysqlpp::UseQueryResult res=query.use();
if(res)
{
mysqlpp::Row row;
Modified: trunk/MythTVReader/MythSource/MythSource.vcproj
===================================================================
--- trunk/MythTVReader/MythSource/MythSource.vcproj 2009-06-06 20:09:50 UTC (rev 566)
+++ trunk/MythTVReader/MythSource/MythSource.vcproj 2009-06-06 20:40:48 UTC (rev 567)
@@ -81,9 +81,10 @@
Name="VCLinkerTool"
RegisterOutput="true"
IgnoreImportLibrary="true"
- AdditionalDependencies="strmiids.lib ws2_32.lib comctl32.lib libmysql.lib"
+ AdditionalDependencies="strmiids.lib ws2_32.lib comctl32.lib mysqlpp_d.lib"
OutputFile="$(OutDir)/MythSource.dll"
LinkIncremental="2"
+ AdditionalLibraryDirectories="$(OutDir)"
ModuleDefinitionFile=".\MythSource.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -181,9 +182,10 @@
Name="VCLinkerTool"
RegisterOutput="true"
IgnoreImportLibrary="true"
- AdditionalDependencies="strmiids.lib ws2_32.lib comctl32.lib libmysql.lib"
+ AdditionalDependencies="strmiids.lib ws2_32.lib comctl32.lib mysqlpp.lib"
OutputFile="$(OutDir)/MythSource.dll"
LinkIncremental="1"
+ AdditionalLibraryDirectories="$(OutDir)"
ModuleDefinitionFile=".\MythSource.def"
GenerateDebugInformation="true"
SubSystem="2"
Modified: trunk/MythTVReader/MythTVReader.sln
===================================================================
--- trunk/MythTVReader/MythTVReader.sln 2009-06-06 20:09:50 UTC (rev 566)
+++ trunk/MythTVReader/MythTVReader.sln 2009-06-06 20:40:48 UTC (rev 567)
@@ -55,7 +55,7 @@
{B71EB910-12E4-4C96-B0C2-5284188F2C9D} = {B71EB910-12E4-4C96-B0C2-5284188F2C9D}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlpp", "libs\mysql++\mysql++_mysqlpp.vcproj", "{366D3D7C-DEED-4F5E-B506-3B235AB0B75C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlpp", "libs\mysql++\vc2008\mysql++_mysqlpp.vcproj", "{366D3D7C-DEED-4F5E-B506-3B235AB0B75C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToolTip", "Shell\ToolTip\ToolTip.vcproj", "{C9FE1F43-9505-4F22-AF52-D732A2CB8EB1}"
ProjectSection(ProjectDependencies) = postProject
Modified: trunk/MythTVReader/NuvConv/NuvConv.vcproj
===================================================================
--- trunk/MythTVReader/NuvConv/NuvConv.vcproj 2009-06-06 20:09:50 UTC (rev 566)
+++ trunk/MythTVReader/NuvConv/NuvConv.vcproj 2009-06-06 20:40:48 UTC (rev 567)
@@ -69,7 +69,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="strmiids.lib quartz.lib libmysql.lib"
+ AdditionalDependencies="strmiids.lib quartz.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="strmiids.lib quartz.lib libmysql.lib"
+ AdditionalDependencies="strmiids.lib quartz.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
Property changes on: trunk/MythTVReader/Release
___________________________________________________________________
Modified: svn:ignore
- *.exe
*.ilk
*.dll
*.pdb
*.exp
*.lib
+ *.exe
*.ilk
*.dll
*.pdb
*.exp
*.lib
mysqlpp
Modified: trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp
===================================================================
--- trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp 2009-06-06 20:09:50 UTC (rev 566)
+++ trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp 2009-06-06 20:40:48 UTC (rev 567)
@@ -175,9 +175,9 @@
query << (info.m_ProgramInfo.m_filesize>0 ? "recordedprogram" : "program");
query << " WHERE chanid = %0q:chanid AND starttime = FROM_UNIXTIME(%1q:starttime) ;";
query.parse();
- query.def["chanid"]=info.m_ProgramInfo.m_chanid;
- query.def["starttime"]=info.m_ProgramInfo.m_startts.GetTime();
- mysqlpp::Result res=query.store();
+ query.template_defaults["chanid"]=info.m_ProgramInfo.m_chanid.GetBuffer();
+ query.template_defaults["starttime"]=info.m_ProgramInfo.m_startts.GetTime();
+ mysqlpp::StoreQueryResult res=query.store();
if(res && res.num_rows()>0)
{
mysqlpp::Row row=res.at(0);
@@ -198,9 +198,9 @@
" AND credits.starttime = FROM_UNIXTIME(%1q:starttime)"
" ORDER BY role;";
query2.parse();
- query2.def["chanid"]=info.m_ProgramInfo.m_chanid;
- query2.def["starttime"]=info.m_ProgramInfo.m_startts.GetTime();
- mysqlpp::Result res=query2.store();
+ query2.template_defaults["chanid"]=info.m_ProgramInfo.m_chanid.GetBuffer();
+ query2.template_defaults["starttime"]=info.m_ProgramInfo.m_startts.GetTime();
+ mysqlpp::StoreQueryResult res=query2.store();
CAtlStringW actors;
CAtlStringW directors;
Modified: trunk/MythTVReader/common/DBUtils.cpp
===================================================================
--- trunk/MythTVReader/common/DBUtils.cpp 2009-06-06 20:09:50 UTC (rev 566)
+++ trunk/MythTVReader/common/DBUtils.cpp 2009-06-06 20:40:48 UTC (rev 567)
@@ -188,7 +188,7 @@
}
query << " ;";
- mysqlpp::Result res=query.store();
+ mysqlpp::StoreQueryResult res=query.store();
if(res.num_rows()==0)
{
return false;
@@ -218,7 +218,7 @@
}
else
{
- if(m_DBConnection.ping()==0)
+ if(m_DBConnection.ping())
{
return true;
}
@@ -256,7 +256,7 @@
mysqlpp::Query query=m_DBConnection.query();
query << "SELECT chanid,starttime FROM recorded WHERE basename=%0q ;";
query.parse();
- mysqlpp::Result res=query.store(file.GetBuffer());
+ mysqlpp::StoreQueryResult res=query.store(file.GetBuffer());
if(res)
{
if(res.num_rows()!=0)
Modified: trunk/MythTVReader/common/ProgramInfo.cpp
===================================================================
--- trunk/MythTVReader/common/ProgramInfo.cpp 2009-06-06 20:09:50 UTC (rev 566)
+++ trunk/MythTVReader/common/ProgramInfo.cpp 2009-06-06 20:40:48 UTC (rev 567)
@@ -316,9 +316,9 @@
"WHERE recorded.chanid = %0q:chanid "
"AND starttime = %1q:starttime ;";
query.parse();
- query.def["chanid"]=channel;
- query.def["starttime"]=starttime;
- mysqlpp::Result res=query.store();
+ query.template_defaults["chanid"]=const_cast<CAtlString&>(channel).GetBuffer();
+ query.template_defaults["starttime"]=const_cast<CAtlString&>(starttime).GetBuffer();
+ mysqlpp::StoreQueryResult res=query.store();
if(res && res.num_rows()>0)
{
mysqlpp::Row row=res.at(0);
@@ -414,9 +414,9 @@
"recorded.progstart = recordedprogram.starttime) "
"WHERE recorded.chanid = %0q:chanid AND recorded.starttime = FROM_UNIXTIME(%1q:starttime) ;";
query.parse();
- query.def["chanid"]=m_chanid;
- query.def["starttime"]=m_recstartts.GetTime();
- mysqlpp::Result res=query.store();
+ query.template_defaults["chanid"]=const_cast<CAtlString&>(m_chanid).GetBuffer();
+ query.template_defaults["starttime"]=m_recstartts.GetTime();
+ mysqlpp::StoreQueryResult res=query.store();
if(res && res.num_rows()>0)
{
mysqlpp::Row row=res.at(0);
@@ -467,9 +467,9 @@
"recorded.progstart = recordedprogram.starttime) "
"WHERE recorded.chanid = %0q:chanid AND recorded.starttime = FROM_UNIXTIME(%1q:starttime) ;";
query.parse();
- query.def["chanid"]=m_chanid;
- query.def["starttime"]=m_recstartts.GetTime();
- mysqlpp::Result res=query.store();
+ query.template_defaults["chanid"]=m_chanid.GetBuffer();
+ query.template_defaults["starttime"]=m_recstartts.GetTime();
+ mysqlpp::StoreQueryResult res=query.store();
if(res && res.num_rows()>0)
{
mysqlpp::Row row=res.at(0);
@@ -539,10 +539,10 @@
query << "DELETE FROM inuseprograms WHERE "
"chanid = %0q:chanid AND starttime = FROM_UNIXTIME(%1:starttime) AND hostname = %2q:hostname AND recusage = %3q:recusage ;";
query.parse();
- query.def["chanid"]=m_chanid;
- query.def["starttime"]=m_recstartts.GetTime();
- query.def["hostname"]=GetHostName();
- query.def["recusage"]=m_inUseForWhat;
+ query.template_defaults["chanid"]=m_chanid.GetBuffer();
+ query.template_defaults["starttime"]=m_recstartts.GetTime();
+ query.template_defaults["hostname"]=GetHostName().GetBuffer();
+ query.template_defaults["recusage"]=m_inUseForWhat.GetBuffer();
query.execute();
if(!bInUse)
@@ -559,13 +559,13 @@
" VALUES "
" (%0q:chanid, FROM_UNIXTIME(%1q:starttime), %2q:recusage, %3q:hostname, FROM_UNIXTIME(%4q:lastupdatetime), %4q:rechost, %5q:recdir);";
query.parse();
- query.def["chanid"]=m_chanid;
- query.def["starttime"]=m_recstartts.GetTime();
- query.def["recusage"]=m_inUseForWhat;
- query.def["hostname"]=GetHostName();
- query.def["lastupdatetime"]=m_lastInUseTime.GetTime();
- query.def["rechost"]=GetHostName();
- query.def["recdir"]=".";
+ query.template_defaults["chanid"]=m_chanid.GetBuffer();
+ query.template_defaults["starttime"]=m_recstartts.GetTime();
+ query.template_defaults["recusage"]=m_inUseForWhat.GetBuffer();
+ query.template_defaults["hostname"]=GetHostName().GetBuffer();
+ query.template_defaults["lastupdatetime"]=m_lastInUseTime.GetTime();
+ query.template_defaults["rechost"]=GetHostName().GetBuffer();
+ query.template_defaults["recdir"]=".";
query.execute();
}
@@ -598,11 +598,11 @@
" AND starttime = FROM_UNIXTIME(%1q:starttime) "
" AND lastupdatetime > FROM_UNIXTIME(%2q:time) ;";
query.parse();
- query.def["chanid"]=m_chanid;
- query.def["starttime"]=m_recstartts.GetTime();
- query.def["time"]=OneHourAgo.GetTime();
+ query.template_defaults["chanid"]=m_chanid.GetBuffer();
+ query.template_defaults["starttime"]=m_recstartts.GetTime();
+ query.template_defaults["time"]=OneHourAgo.GetTime();
- mysqlpp::Result res=query.store();
+ mysqlpp::UseQueryResult res=query.use();
if(res)
{
mysqlpp::Row row;
Modified: trunk/MythTVReader/common/SeekTable.cpp
===================================================================
--- trunk/MythTVReader/common/SeekTable.cpp 2009-06-06 20:09:50 UTC (rev 566)
+++ trunk/MythTVReader/common/SeekTable.cpp 2009-06-06 20:40:48 UTC (rev 567)
@@ -308,7 +308,7 @@
{
if(m_DBConnection.connected())
{
- if(m_DBConnection.ping()!=0)
+ if(!m_DBConnection.ping())
{
return false;
}
@@ -325,11 +325,11 @@
mysqlpp::Query query=m_DBConnection.query();
query << "SELECT mark,offset FROM recordedseek WHERE chanid=%0q:chanid AND starttime=%1q:starttime AND type=%2q:type";
query.parse();
- query.def["chanid"]=m_chanid;
- query.def["starttime"]=m_starttime;
- query.def["type"]=m_MarkType;
+ query.template_defaults["chanid"]=m_chanid.GetBuffer();
+ query.template_defaults["starttime"]=m_starttime.GetBuffer();
+ query.template_defaults["type"]=m_MarkType;
- mysqlpp::Result res=query.store();
+ mysqlpp::StoreQueryResult res=query.store();
mysqlpp::Row row;
for(mysqlpp::Row::size_type i=0;row=res.at(i);i++)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2009-06-06 17:43:58
|
Revision: 565
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=565&view=rev
Author: tobbej
Date: 2009-06-06 17:43:57 +0000 (Sat, 06 Jun 2009)
Log Message:
-----------
display UTF8 characters properly in filter property page.
Modified Paths:
--------------
trunk/MythTVReader/MythSource/MythSourcePage.cpp
Modified: trunk/MythTVReader/MythSource/MythSourcePage.cpp
===================================================================
--- trunk/MythTVReader/MythSource/MythSourcePage.cpp 2009-06-06 17:02:25 UTC (rev 564)
+++ trunk/MythTVReader/MythSource/MythSourcePage.cpp 2009-06-06 17:43:57 UTC (rev 565)
@@ -172,14 +172,14 @@
{
CProgramInfo proginfo;
proginfo.FromString(CAtlString(pProgInfo));
- ///@todo fix the character conversion to do something better and still be compatible with win9x/me
- SetDlgItemText(IDC_MYTHSOURCEPAGE_TITLE,CW2A(proginfo.m_title,CP_UTF8));
- SetDlgItemText(IDC_MYTHSOURCEPAGE_SUBTITLE,CW2A(proginfo.m_subtitle,CP_UTF8));
- SetDlgItemText(IDC_MYTHSOURCEPAGE_CATEGORY,CW2A(proginfo.m_category,CP_UTF8));
- SetDlgItemText(IDC_MYTHSOURCEPAGE_CHANNEL,CW2A(proginfo.m_channame,CP_UTF8));
- SetDlgItemText(IDC_MYTHSOURCEPAGE_CALLSIGN,CW2A(proginfo.m_chansign,CP_UTF8));
- SetDlgItemText(IDC_MYTHSOURCEPAGE_DESCRIPTION,CW2A(proginfo.m_description,CP_UTF8));
+ SetDlgItemTextW(m_hWnd,IDC_MYTHSOURCEPAGE_TITLE,proginfo.m_title);
+ SetDlgItemTextW(m_hWnd,IDC_MYTHSOURCEPAGE_SUBTITLE,proginfo.m_subtitle);
+ SetDlgItemTextW(m_hWnd,IDC_MYTHSOURCEPAGE_CATEGORY,proginfo.m_category);
+ SetDlgItemTextW(m_hWnd,IDC_MYTHSOURCEPAGE_CHANNEL,proginfo.m_channame);
+ SetDlgItemTextW(m_hWnd,IDC_MYTHSOURCEPAGE_CALLSIGN,proginfo.m_chansign);
+ SetDlgItemTextW(m_hWnd,IDC_MYTHSOURCEPAGE_DESCRIPTION,proginfo.m_description);
+
CoTaskMemFree(pProgInfo);
pProgInfo=NULL;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2009-06-06 17:03:23
|
Revision: 564
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=564&view=rev
Author: tobbej
Date: 2009-06-06 17:02:25 +0000 (Sat, 06 Jun 2009)
Log Message:
-----------
fixe a couple of mysql issues preventing livetv from working
Modified Paths:
--------------
trunk/MythTVReader/MythSource/LiveTVChain.cpp
trunk/MythTVReader/common/ProgramInfo.cpp
Modified: trunk/MythTVReader/MythSource/LiveTVChain.cpp
===================================================================
--- trunk/MythTVReader/MythSource/LiveTVChain.cpp 2009-06-05 19:55:19 UTC (rev 563)
+++ trunk/MythTVReader/MythSource/LiveTVChain.cpp 2009-06-06 17:02:25 UTC (rev 564)
@@ -64,11 +64,10 @@
}
mysqlpp::Query query=con.query();
- query << "DELETE FROM tvchain WHERE chainid = %0q:chainid";
+ query << "DELETE FROM tvchain WHERE chainid = %0q";
query.parse();
- query.def["chainid"]=m_id;
- mysqlpp::ResNSel result=query.execute();
- ATLASSERT(result.success);
+ mysqlpp::ResNSel result=query.execute(m_id.GetBuffer());
+ ATLASSERT(result.success && result.rows>0);
}
catch(mysqlpp::Exception &e)
{
@@ -93,11 +92,10 @@
query << "SELECT chanid, UNIX_TIMESTAMP(starttime), UNIX_TIMESTAMP(endtime), discontinuity, "
"chainpos, hostprefix, cardtype, channame, input "
"FROM tvchain "
- "WHERE chainid = %0q:chainid ORDER BY chainpos;";
+ "WHERE chainid = %0q ORDER BY chainpos;";
query.parse();
- query.def["chainid"]=m_id;
-
- mysqlpp::Result res=query.store();
+
+ mysqlpp::Result res=query.store(m_id.GetBuffer());
if(res)
{
mysqlpp::Row row;
@@ -118,7 +116,7 @@
}
catch(mysqlpp::Exception &e)
{
- ATLTRACE(_T("%s(%d) : CLiveTVChain::DestroyChain db exception: %s\n"),__FILE__,__LINE__,e.what());
+ ATLTRACE(_T("%s(%d) : CLiveTVChain::ReloadAll db exception: %s\n"),__FILE__,__LINE__,e.what());
}
m_curpos=ProgramIsAt(m_cur_chanid,m_cur_starttime);
Modified: trunk/MythTVReader/common/ProgramInfo.cpp
===================================================================
--- trunk/MythTVReader/common/ProgramInfo.cpp 2009-06-05 19:55:19 UTC (rev 563)
+++ trunk/MythTVReader/common/ProgramInfo.cpp 2009-06-06 17:02:25 UTC (rev 564)
@@ -408,7 +408,7 @@
}
mysqlpp::Query query=con.query();
query << "SELECT commflagged, cutlist, autoexpire, "
- "editing, bookmark, watched, preserve"
+ "editing, bookmark, watched, preserve "
"FROM recorded LEFT JOIN recordedprogram ON "
"(recorded.chanid = recordedprogram.chanid AND "
"recorded.progstart = recordedprogram.starttime) "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2009-06-05 19:55:46
|
Revision: 563
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=563&view=rev
Author: tobbej
Date: 2009-06-05 19:55:19 +0000 (Fri, 05 Jun 2009)
Log Message:
-----------
Update to protocol version 40.
Fixed a couple of ASSERTS in CSeekTable.
Some UTF8 filename related changes.
A few minor fixes to the vista property shell extension.
Prevent crashing in the source filter caused by calling IFileSourceFilter::Load too eary before the filter is added to the graph (newer versions of graphedit does this)
Note that these changes have not had much testing other than loading an analog recording and playing it back successfully.
LiveTV is still most broken in many ways so don't try it :)
Modified Paths:
--------------
trunk/MythTVReader/MythSource/BaseCache.cpp
trunk/MythTVReader/MythSource/BaseCache.h
trunk/MythTVReader/MythSource/ComFilterEventReceiver.cpp
trunk/MythTVReader/MythSource/FileCache.cpp
trunk/MythTVReader/MythSource/FileCache.h
trunk/MythTVReader/MythSource/LiveTVChain.cpp
trunk/MythTVReader/MythSource/MythBackendComm.cpp
trunk/MythTVReader/MythSource/MythBackendComm.h
trunk/MythTVReader/MythSource/MythSourceFilter.cpp
trunk/MythTVReader/MythSource/RemoteFile.cpp
trunk/MythTVReader/MythSource/RemoteFile.h
trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp
trunk/MythTVReader/common/ProgramInfo.cpp
trunk/MythTVReader/common/ProgramInfo.h
trunk/MythTVReader/common/SeekTable.cpp
trunk/MythTVReader/common/util.h
Modified: trunk/MythTVReader/MythSource/BaseCache.cpp
===================================================================
--- trunk/MythTVReader/MythSource/BaseCache.cpp 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/MythSource/BaseCache.cpp 2009-06-05 19:55:19 UTC (rev 563)
@@ -26,7 +26,7 @@
#include ".\basecache.h"
#include "format.h"
-CBaseCache::CBaseCache(CAtlString path,bool bUseReadAhead,int retries)
+CBaseCache::CBaseCache(CAtlStringW path,bool bUseReadAhead,int retries)
:CRemoteFile(path,bUseReadAhead,retries)
{
Modified: trunk/MythTVReader/MythSource/BaseCache.h
===================================================================
--- trunk/MythTVReader/MythSource/BaseCache.h 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/MythSource/BaseCache.h 2009-06-05 19:55:19 UTC (rev 563)
@@ -33,7 +33,7 @@
public CRemoteFile
{
public:
- CBaseCache(CAtlString path,bool bUseReadAhead=false,int retries=-1);
+ CBaseCache(CAtlStringW path,bool bUseReadAhead=false,int retries=-1);
virtual ~CBaseCache(void);
virtual LONG Read(LONGLONG pos,void *data,int size)=0;
virtual void BeginFlush()=0;
Modified: trunk/MythTVReader/MythSource/ComFilterEventReceiver.cpp
===================================================================
--- trunk/MythTVReader/MythSource/ComFilterEventReceiver.cpp 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/MythSource/ComFilterEventReceiver.cpp 2009-06-05 19:55:19 UTC (rev 563)
@@ -73,18 +73,25 @@
else if(eventname.Find("ASK_RECORDING")==0)
{
//a scheduled recording is about to start
- long cardnum;
- long timeuntil;
+ int cardnum; //recorder number
+ int timeuntil; //time until recording starts in seconds
+ int hasrec; //
+ int haslater; //
CAtlArray<CAtlString> list;
SplitString(eventname,list," ");
- ATLASSERT(list.GetCount()==3);
- cardnum=atol(list[1]);
- timeuntil=atol(list[2]);
+ ATLASSERT(list.GetCount()==4);
+
+ cardnum=atoi(list[0]);
+ timeuntil=atoi(list[1]);
+ hasrec=atoi(list[2]);
+ haslater=atoi(list[3]);
+
+ ///@todo needs fixing
+ ///extra is a CProgramInfo as a list
+ /*SplitString(extra,list);
- SplitString(extra,list);
-
CComBSTR title=list[0];
CComBSTR chanstr=list[1];
CComBSTR chansign=list[2];
@@ -93,7 +100,7 @@
if(recnum!=-1 && recnum==cardnum)
{
m_pFilter->Fire_AskRecording(timeuntil,title,chanstr,chansign,channame);
- }
+ }*/
}
else if(eventname.Find("SIGNAL")==0)
Modified: trunk/MythTVReader/MythSource/FileCache.cpp
===================================================================
--- trunk/MythTVReader/MythSource/FileCache.cpp 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/MythSource/FileCache.cpp 2009-06-05 19:55:19 UTC (rev 563)
@@ -32,7 +32,7 @@
*/
#define MAX_READ_TRIES 3
-CFileCache::CFileCache(CAtlString path) :
+CFileCache::CFileCache(CAtlStringW path) :
//don't use the backend readahead and auto retry on read fails
//we have our own read ahead and retrying on read fails
CBaseCache(path,false,0),
Modified: trunk/MythTVReader/MythSource/FileCache.h
===================================================================
--- trunk/MythTVReader/MythSource/FileCache.h 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/MythSource/FileCache.h 2009-06-05 19:55:19 UTC (rev 563)
@@ -42,7 +42,7 @@
public CThread
{
public:
- CFileCache(CAtlString path);
+ CFileCache(CAtlStringW path);
virtual ~CFileCache(void);
virtual LONG Read(LONGLONG pos,void *data,int size);
virtual void BeginFlush();
Modified: trunk/MythTVReader/MythSource/LiveTVChain.cpp
===================================================================
--- trunk/MythTVReader/MythSource/LiveTVChain.cpp 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/MythSource/LiveTVChain.cpp 2009-06-05 19:55:19 UTC (rev 563)
@@ -183,7 +183,7 @@
{
return false;
}
- prog.m_pathname=entry.m_hostprefix+prog.m_pathname;
+ prog.m_pathname=CT2W(entry.m_hostprefix,CP_UTF8)+prog.m_pathname;
return true;
}
Modified: trunk/MythTVReader/MythSource/MythBackendComm.cpp
===================================================================
--- trunk/MythTVReader/MythSource/MythBackendComm.cpp 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/MythSource/MythBackendComm.cpp 2009-06-05 19:55:19 UTC (rev 563)
@@ -329,7 +329,7 @@
return false;
}
-bool CMythBackendComm::OpenFile(CAtlString &url)
+bool CMythBackendComm::OpenFile(CAtlStringW &url)
{
CAutoLockCriticalSection<CComAutoCriticalSection> lock(&m_Lock);
if(m_State!=PlaybackState_Stopped)
@@ -349,7 +349,7 @@
//try to get CProgramInfo for this file, if possibel
CUrl tmpurl;
- if(tmpurl.CrackUrl(url))
+ if(tmpurl.CrackUrl(CW2T(url,CP_UTF8)))
{
CAtlString filename;
CAtlString chanid;
@@ -569,15 +569,20 @@
CAtlString cmd;
CAtlString pgstr;
pginfo.ToString(pgstr);
- cmd.Format("QUERY_CHECKFILE[]:[]%s",pgstr.GetBuffer());
+ bool checkslaves=false;
+ cmd.Format("QUERY_CHECKFILE[]:[]%d[]:[]%s",(int)checkslaves,pgstr.GetBuffer());
if(!SendCommand(cmd,resp))
{
return false;
}
CAtlArray<CAtlString> list;
SplitString(resp,list);
- ATLASSERT(list.GetCount()==1);
- return atoi(list[0])!=0;
+ ATLASSERT(list.GetCount()==2);
+
+ bool exists=atoi(list[0])!=0;
+ //pginfo.m_pathname=list[1];
+
+ return exists;
}
int CMythBackendComm::DeleteRecording(CProgramInfo &pginfo,bool bForgetHistory,bool bForceMetadataDelete)
Modified: trunk/MythTVReader/MythSource/MythBackendComm.h
===================================================================
--- trunk/MythTVReader/MythSource/MythBackendComm.h 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/MythSource/MythBackendComm.h 2009-06-05 19:55:19 UTC (rev 563)
@@ -53,7 +53,7 @@
bool StartLiveTV();
bool StartLiveTV(int recnum);
- bool OpenFile(CAtlString &url);
+ bool OpenFile(CAtlStringW &url);
bool OpenFile(CProgramInfo &proginfo);
HRESULT GetFileSize(LONGLONG &Total,LONGLONG &Available);
Modified: trunk/MythTVReader/MythSource/MythSourceFilter.cpp
===================================================================
--- trunk/MythTVReader/MythSource/MythSourceFilter.cpp 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/MythSource/MythSourceFilter.cpp 2009-06-05 19:55:19 UTC (rev 563)
@@ -33,6 +33,7 @@
#include "MemOutPin.h"
#include "SeekPin.h"
#include "ProgramInfo.h"
+#include "QueryPerfCounter.h"
// CMythSourceFilter
@@ -81,7 +82,6 @@
pAsyncPin->DeInit();
}
-
m_pOutPin->Release();
m_pOutPin=NULL;
}
@@ -192,16 +192,25 @@
{
return S_OK;
}
+ CQueryPerfCounter cnt;
+ cnt.Start();
+ double time1=0;
+ double time2=0;
+ double time3=0;
HRESULT hr;
CMemOutPin *pMemPin=dynamic_cast<CMemOutPin*>(m_pOutPin);
if(pMemPin!=NULL)
{
pMemPin->StopThread();
+ cnt.Stop();
+ time1=cnt.Duration();
if(pMemPin->m_pMemAllocator!=NULL)
{
hr=pMemPin->m_pMemAllocator->Decommit();
}
+ cnt.Stop();
+ time2=cnt.Duration();
}
if(m_pSeekPin!=NULL)
{
@@ -209,7 +218,12 @@
{
hr=m_pSeekPin->m_pMemAllocator->Decommit();
}
+ cnt.Stop();
+ time3=cnt.Duration();
}
+ cnt.Stop();
+ double time4=cnt.Duration();
+ ATLTRACE(_T("%g %g %g %g"),time1,time2,time3,time4);
m_FilterState=State_Stopped;
return S_OK;
@@ -496,6 +510,8 @@
///@todo need to have some kind of flushing here, problem is that the output pin can change.
+ CQueryPerfCounter cnt;
+ cnt.Start();
bool bDiscontinuity=false;
bool bNewType=false;
HRESULT hr=m_BackendComm.SwitchToEntry(bDiscontinuity,bNewType,pos);
@@ -503,11 +519,15 @@
{
return hr;
}
+ cnt.Stop();
+ double time1=cnt.Duration();
GUID oldMajorType=m_MajorType;
GUID oldSubType=m_SubType;
//update mediatype, since it could have changed.
m_BackendComm.GetMediaType(m_MajorType,m_SubType);
+ cnt.Stop();
+ double time2=cnt.Duration();
CComPtr<IPin> pConnectedPin;
if(m_pOutPin!=NULL)
@@ -564,7 +584,10 @@
}
}
}
+ cnt.Stop();
+ double time3=cnt.Duration();
LoadSeekTable();
+ ATLTRACE(_T("%g %g %g"),time1,time2,time3);
return S_OK;
}
@@ -889,9 +912,18 @@
{
return E_FAIL;
}
+
+ //this function can only be called when the filter is joined to a filter graph
+ //calling this without a filter graph is not valid and makes no sense
+ //this is what newer versions of graphedit does.
+ if(m_pGraph==NULL)
+ {
+ ATLASSERT(false);
+ return VFW_E_NOT_IN_GRAPH;
+ }
- CAtlString orgfile=COLE2T(pszFileName);
- if(orgfile.Find("mythlivetv:")!=-1)
+ CAtlStringW orgfile=pszFileName;
+ if(orgfile.Find(L"mythlivetv:")!=-1)
{
m_FileName=orgfile;
@@ -902,26 +934,26 @@
//parse options in the path/filename part of the url
CUrl url;
- url.CrackUrl(orgfile);
+ url.CrackUrl(CW2T(orgfile,CP_UTF8));
if(url.GetExtraInfoLength()>0)
{
- CAtlString extrainfo=url.GetExtraInfo();
+ CAtlStringW extrainfo=CT2W(url.GetExtraInfo(),CP_UTF8);
int curpos=0;
- CAtlString token=extrainfo.Tokenize("&?",curpos);
+ CAtlStringW token=extrainfo.Tokenize(L"&?",curpos);
while(token!="")
{
- if(!bFoundRecNum && token.Find("recnum=")==0)
+ if(!bFoundRecNum && token.Find(L"recnum=")==0)
{
- recnum=atoi(token.Mid(7));
+ recnum=_wtoi(token.Mid(7));
bFoundRecNum=true;
}
- if(!bFoundChan && token.Find("chnum=")==0)
+ if(!bFoundChan && token.Find(L"chnum=")==0)
{
chan=token.Mid(6);
bFoundChan=true;
}
- token=extrainfo.Tokenize("&",curpos);
+ token=extrainfo.Tokenize(L"&",curpos);
}
}
@@ -969,11 +1001,11 @@
}
else
{
- CAtlString file;
- int pos=orgfile.ReverseFind('\\');
+ CAtlStringW file;
+ int pos=orgfile.ReverseFind(L'\\');
if(pos==-1)
{
- pos=orgfile.ReverseFind('/');
+ pos=orgfile.ReverseFind(L'/');
}
if(pos==-1)
{
@@ -1005,7 +1037,7 @@
}
//coudn't find the specified file, try to open it anyway and hope for the best
- if(orgfile.Find("myth://")!=-1)
+ if(orgfile.Find(L"myth://")!=-1)
{
if(!m_BackendComm.OpenFile(orgfile))
{
@@ -1165,6 +1197,7 @@
HRESULT CMythSourceFilter::GetGraphBuilder(CComPtr<IGraphBuilder> &pBuilder)
{
+ ATLASSERT(m_pGraph!=NULL);
return m_pGraph->QueryInterface(IID_IGraphBuilder,(void**)&pBuilder);
}
Modified: trunk/MythTVReader/MythSource/RemoteFile.cpp
===================================================================
--- trunk/MythTVReader/MythSource/RemoteFile.cpp 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/MythSource/RemoteFile.cpp 2009-06-05 19:55:19 UTC (rev 563)
@@ -26,14 +26,14 @@
#include "remotefile.h"
#include "util.h"
-CRemoteFile::CRemoteFile(CAtlString &url,bool bUseReadAhead,int retries)
+CRemoteFile::CRemoteFile(CAtlStringW &url,bool bUseReadAhead,int retries)
:m_recnum(-1),
m_CurrentReadPos(0),
m_FileSize(-1),
m_bUseReadAhead(bUseReadAhead),
m_retries(retries)
{
- m_url.CrackUrl(url);
+ m_url.CrackUrl(CW2T(url,CP_UTF8));
m_query="QUERY_FILETRANSFER";
OpenSocket();
}
@@ -57,21 +57,21 @@
try
{
- m_ctrlcon.Close();
+ m_sock.Close();
}
catch(CSockException e)
{
- //can't do much about the error anyway so just ignore it.
- ATLTRACE(_T("%s(%d) : Socket exception when closing control socket: %s\n"),__FILE__,__LINE__,e.GetError().GetBuffer());
+ ATLTRACE(_T("%s(%d) : Socket exception when closing data socket: %s\n"),__FILE__,__LINE__,e.GetError().GetBuffer());
}
try
{
- m_sock.Close();
+ m_ctrlcon.Close();
}
catch(CSockException e)
{
- ATLTRACE(_T("%s(%d) : Socket exception when closing data socket: %s\n"),__FILE__,__LINE__,e.GetError().GetBuffer());
+ //can't do much about the error anyway so just ignore it.
+ ATLTRACE(_T("%s(%d) : Socket exception when closing control socket: %s\n"),__FILE__,__LINE__,e.GetError().GetBuffer());
}
}
}
@@ -215,32 +215,6 @@
LONGLONG CRemoteFile::Seek(LONGLONG pos,int whence,LONGLONG curpos)
{
- //curpos only matters when whence is SEEK_CUR
- /*if(m_bRingbuffer)
- {
- switch(whence)
- {
- case SEEK_SET:
- if(pos>GetFilePosition())
- {
- return -1;
- }
- break;
- case SEEK_CUR:
- if((pos+curpos)>GetFilePosition())
- {
- return -1;
- }
- break;
- case SEEK_END:
- if(pos>0)
- {
- return -1;
- }
- break;
- }
- }*/
-
CAtlString cmd;
CAtlString response;
cmd.Format("%s %d[]:[]SEEK[]:[]%ld[]:[]%ld[]:[]%d[]:[]%ld[]:[]%ld",
Modified: trunk/MythTVReader/MythSource/RemoteFile.h
===================================================================
--- trunk/MythTVReader/MythSource/RemoteFile.h 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/MythSource/RemoteFile.h 2009-06-05 19:55:19 UTC (rev 563)
@@ -43,7 +43,7 @@
class CRemoteFile
{
public:
- CRemoteFile(CAtlString &url,bool bUseReadAhead=true,int retries=-1);
+ CRemoteFile(CAtlStringW &url,bool bUseReadAhead=true,int retries=-1);
virtual ~CRemoteFile(void);
LONGLONG GetFileSize();
virtual void SetFileSize(LONGLONG FileSize);
Modified: trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp
===================================================================
--- trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp 2009-06-05 19:55:19 UTC (rev 563)
@@ -115,7 +115,7 @@
HRESULT hr=PSCreateMemoryPropertyStore(IID_PPV_ARGS(&m_pStoreCache));
if(SUCCEEDED(hr))
{
- StoreDataInCacheStringVector(PKEY_Kind,CAtlStringW(KIND_RECORDEDTV));
+ StoreDataInCacheStringVector(PKEY_Kind,CAtlStringW("recordedtv;video"));
StoreDataInCache(PKEY_KindText,L"Recorded TV");
CNuvInfo::CFileInfo info;
@@ -145,6 +145,10 @@
//localtime to UTC
TIME_ZONE_INFORMATION tz;
DWORD dwRet=GetTimeZoneInformation(&tz);
+ //the problem is that tz.Bias must be adjusted to match the date
+ //DST state of the timestamp
+ //so need to compare the timestamp against tz.StandardDate and
+ //tz.DaylightName and then set bias correctly
if(dwRet!=TIME_ZONE_ID_INVALID)
{
TzSpecificLocalTimeToSystemTime(&tz,&st,&ut);
@@ -156,8 +160,9 @@
}
StoreDataInCacheStringVector(PKEY_Keywords,info.m_ProgramInfo.m_category);
StoreDataInCache(PKEY_RecordedTV_IsRepeatBroadcast,(BOOL)(info.m_ProgramInfo.m_repeat ? TRUE : FALSE));
- StoreDataInCache(PKEY_RecordedTV_IsHDContent,(BOOL)(info.m_ProgramInfo.m_programflags&FL_HDTV ? TRUE : FALSE));
- StoreDataInCache(PKEY_RecordedTV_IsClosedCaptioningAvailable,(BOOL)(info.m_ProgramInfo.m_programflags&FL_CC ? TRUE : FALSE));
+ StoreDataInCache(PKEY_RecordedTV_IsHDContent,(BOOL)(info.m_ProgramInfo.m_videoproperties&VID_HDTV ? TRUE : FALSE));
+ //hmmm...
+ //StoreDataInCache(PKEY_RecordedTV_IsClosedCaptioningAvailable,(BOOL)(info.m_ProgramInfo.m_programflags&FL_CC ? TRUE : FALSE));
try
{
@@ -316,14 +321,26 @@
void CMythTVProperties::StoreDataInCache(PROPERTYKEY key,CAtlStringW data)
{
- PROPVARIANT pv;
- PropVariantInit(&pv);
- HRESULT hr=InitPropVariantFromString(data,&pv);
- if(SUCCEEDED(hr))
+ HRESULT hr;
+ if(data.GetLength()>0)
{
- hr=m_pStoreCache->SetValueAndState(key,&pv,PSC_NORMAL);
+ PROPVARIANT pv;
+ PropVariantInit(&pv);
+ hr=InitPropVariantFromString(data,&pv);
+ if(SUCCEEDED(hr))
+ {
+ hr=m_pStoreCache->SetValueAndState(key,&pv,PSC_NORMAL);
+ ATLASSERT(SUCCEEDED(hr));
+ }
+ PropVariantClear(&pv);
}
- PropVariantClear(&pv);
+ else
+ {
+ PROPVARIANT pv;
+ PropVariantInit(&pv);
+ hr=m_pStoreCache->SetValueAndState(key,&pv,PSC_NOTINSOURCE);
+ ATLASSERT(SUCCEEDED(hr));
+ }
}
void CMythTVProperties::StoreDataInCache(PROPERTYKEY key,ULONG data)
@@ -376,7 +393,7 @@
{
PROPVARIANT pv;
PropVariantInit(&pv);
- HRESULT hr=InitPropVariantFromStringAsVector(data,&pv);
+ HRESULT hr=InitPropVariantFromStringAsVector(data.GetBuffer(),&pv);
if(SUCCEEDED(hr))
{
hr=m_pStoreCache->SetValueAndState(key,&pv,PSC_NORMAL);
Modified: trunk/MythTVReader/common/ProgramInfo.cpp
===================================================================
--- trunk/MythTVReader/common/ProgramInfo.cpp 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/common/ProgramInfo.cpp 2009-06-05 19:55:19 UTC (rev 563)
@@ -41,7 +41,6 @@
m_repeat(false),
m_recpriority(0),
m_chancommfree(0),
-m_savedrecstatus(rsUnknown),
m_recgroup("Default"),
m_shareable(false),
m_stars(0),
@@ -50,7 +49,12 @@
m_findid(0),
m_duplicate(false),
m_recpriority2(0),
-m_parentid(0)
+m_parentid(0),
+m_storagegroup("Default"),
+m_audioproperties(0),
+m_videoproperties(0),
+m_subtitleType(0),
+m_transcoder(0)
{
m_startts=CTime::GetCurrentTime();
m_endts=m_startts;
@@ -122,58 +126,165 @@
m_orginalAirDate=list[offset+37].Trim();
m_hasairdate=atoi(list[offset+38])!=0;
m_playgroup=CA2W((list[offset+39].Trim() != "" ? list[offset+39].Trim() : "Default"),CP_UTF8);
- m_recpriority2=atoi(list[offset+39]);
- m_parentid=atoi(list[offset+40]);
+ m_recpriority2=atoi(list[offset+40]);
+ m_parentid=atoi(list[offset+41]);
+ m_storagegroup=CA2W((list[offset+42].Trim() != "" ? list[offset+42].Trim() : "Default"),CP_UTF8);
+ m_audioproperties=atoi(list[offset+43]);
+ m_videoproperties=atoi(list[offset+44]);
+ m_subtitleType=atoi(list[offset+45]);
return true;
}
+void CProgramInfo::ToList(CAtlArray<CAtlString> &list)
+{
+ char buffer[65];
+ errno_t ret=0;
+
+ list.RemoveAll();
+ list.Add(CW2A(m_title,CP_UTF8));
+ list.Add(CW2A(m_subtitle,CP_UTF8));
+ list.Add(CW2A(m_description,CP_UTF8));
+ list.Add(CW2A(m_category,CP_UTF8));
+ list.Add(m_chanid);
+ list.Add(m_chanstr);
+ list.Add(CW2A(m_chansign,CP_UTF8));
+ list.Add(CW2A(m_channame,CP_UTF8));
+ list.Add(CW2A(m_pathname,CP_UTF8));
+
+ ret=_ltoa_s((long)(m_filesize>>32),buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_ltoa_s((long)m_filesize&0xffffffff,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_i64toa_s(m_startts.GetTime(),buffer,65,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_i64toa_s(m_endts.GetTime(),buffer,65,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s((int)m_duplicate,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s((int)m_shareable,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s(m_findid,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ list.Add(m_hostname);
+
+ ret=_itoa_s(m_sourceid,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s(m_cardid,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s(m_inputid,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s(m_recpriority,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s((int)m_recstatus,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s(m_recordid,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s((int)m_rectype,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_ltoa_s((int)m_dupin,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s((int)m_dupmethod,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_i64toa_s(m_recstartts.GetTime(),buffer,65,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_i64toa_s(m_recendts.GetTime(),buffer,65,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s((int)m_repeat,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s((int)m_programflags,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ list.Add(CW2A(m_recgroup.GetLength()>0 ? m_recgroup.GetBuffer() : L"Default",CP_UTF8));
+
+ ret=_itoa_s(m_chancommfree,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ list.Add(m_chanoutputfilters);
+ list.Add(m_seriesid);
+ list.Add(m_programid);
+
+ ret=_i64toa_s(m_lastmodified.GetTime(),buffer,65,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ sprintf_s(buffer,"%f",m_stars);
+ list.Add(buffer);
+ list.Add(m_orginalAirDate);
+
+ ret=_itoa_s((int)m_hasairdate,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+ list.Add(CW2A(m_playgroup.GetLength()>0 ? m_playgroup.GetBuffer() : L"Default",CP_UTF8));
+
+ ret=_itoa_s(m_recpriority2,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s(m_parentid,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ list.Add(CW2A(m_storagegroup.GetLength()>0 ? m_storagegroup.GetBuffer() : L"Default",CP_UTF8));
+
+ ret=_itoa_s(m_audioproperties,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s(m_videoproperties,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+
+ ret=_itoa_s(m_subtitleType,buffer,10);
+ ATLASSERT(ret==0);
+ list.Add(buffer);
+}
+
void CProgramInfo::ToString(CAtlString &str)
{
- str.Format("%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%ld[]:[]%ld[]:[]%I64d[]:[]%I64d[]:[]%d[]:[]%d[]:[]%d[]:[]%s[]:[]%d[]:[]%d[]:[]%d[]:[]%d[]:[]%d[]:[]%u[]:[]%d[]:[]%d[]:[]%d[]:[]%I64d[]:[]%I64d[]:[]%d[]:[]%d[]:[]%s[]:[]%d[]:[]%s[]:[]%s[]:[]%s[]:[]%I64d[]:[]%g[]:[]%s[]:[]%d[]:[]%s[]:[]%d[]:[]%d",
- CW2A(m_title,CP_UTF8),
- CW2A(m_subtitle,CP_UTF8),
- CW2A(m_description,CP_UTF8),
- CW2A(m_category,CP_UTF8),
- m_chanid.GetBuffer(),
- m_chanstr.GetBuffer(),
- CW2A(m_chansign,CP_UTF8),
- CW2A(m_channame,CP_UTF8),
- m_pathname.GetBuffer(),
- (long)(m_filesize>>32),
- (long)m_filesize&0xffffffff,
- m_startts.GetTime(),
- m_endts.GetTime(),
- (int)m_duplicate,
- (int)m_shareable,
- m_findid,
- m_hostname.GetBuffer(),
- m_sourceid,
- m_cardid,
- m_inputid,
- m_recpriority,
- (int)m_recstatus,
- m_recordid,
- (int)m_rectype,
- (int)m_dupin,
- (int)m_dupmethod,
- m_recstartts.GetTime(),
- m_recendts.GetTime(),
- (int)m_repeat,
- (int)m_programflags,
- CW2A(m_recgroup.GetLength()>0 ? m_recgroup.GetBuffer() : L"Default",CP_UTF8),
- m_chancommfree,
- m_chanoutputfilters.GetBuffer(),
- m_seriesid.GetBuffer(),
- m_programid.GetBuffer(),
- m_lastmodified.GetTime(),
- m_stars,
- m_orginalAirDate.GetBuffer(),
- (int)m_hasairdate,
- CW2A(m_playgroup.GetLength()>0 ? m_playgroup.GetBuffer() : L"Default",CP_UTF8),
- m_recpriority2,
- m_parentid
- );
+ CAtlArray<CAtlString> list;
+ ToList(list);
+ JoinString(str,list);
}
bool CProgramInfo::GetProgramFromRecorded(const CAtlString &channel,const CTime &starttime,CProgramInfo &prog)
@@ -194,11 +305,11 @@
mysqlpp::Query query=con.query();
query << "SELECT recorded.chanid,UNIX_TIMESTAMP(starttime),UNIX_TIMESTAMP(endtime),title, "
"subtitle,description,channel.channum, "
- "channel.callsign,channel.name,channel.commfree, "
+ "channel.callsign,channel.name,channel.commmethod, "
"channel.outputfilters,seriesid,programid,filesize, "
"UNIX_TIMESTAMP(lastmodified),stars,previouslyshown,originalairdate, "
"hostname,recordid,transcoder,playgroup, "
- "recorded.recpriority,UNIX_TIMESTAMP(progstart),UNIX_TIMESTAMP(progend),basename,recgroup,category "
+ "recorded.recpriority,UNIX_TIMESTAMP(progstart),UNIX_TIMESTAMP(progend),basename,recgroup,storagegroup "
"FROM recorded "
"LEFT JOIN channel "
"ON recorded.chanid = channel.chanid "
@@ -224,7 +335,7 @@
prog.m_chanstr=row[6].is_null() ? "" : row[6];
prog.m_chansign=row[7].is_null() ? L"" : CA2W(row[7],CP_UTF8);
prog.m_channame=row[8].is_null() ? L"" : CA2W(row[8],CP_UTF8);
- prog.m_chancommfree=row[9].is_null() ? 0 : row[9];
+ prog.m_chancommfree=(row[9].is_null() ? 0 : row[9])== -2;
prog.m_chanoutputfilters=row[10].is_null() ? "" : row[10];
prog.m_seriesid=row[11];
prog.m_programid=row[12];
@@ -243,7 +354,7 @@
if(row[17].is_null() || row[17].length()==0)
{
- prog.m_orginalAirDate=prog.m_startts.Format("%Y-%m-%d");
+ prog.m_orginalAirDate="";
prog.m_hasairdate=false;
}
else
@@ -252,18 +363,28 @@
prog.m_hasairdate=true;
}
prog.m_hostname=row[18];
+ prog.m_recstatus=rsRecorded;
if(!row[19].is_null())
{
prog.m_recordid=atoi(row[19]);
}
- //prog.m_transcoder=(row[20]==NULL ? 0 : atoi(row[20]));
+
+ if(!row[20].is_null())
+ {
+ prog.m_transcoder=atoi(row[20]);
+ }
+ else
+ {
+ prog.m_transcoder=0;
+ }
prog.m_programflags=prog.GetProgramFlags();
+ prog.GetProgramProperties();
+
prog.m_recgroup=CA2W(row[26],CP_UTF8);
+ prog.m_storagegroup=CA2W(row[27],CP_UTF8);
prog.m_playgroup=CA2W(row[21],CP_UTF8);
prog.m_recpriority=atoi(row[22]);
- prog.m_pathname=row[25];
-
- prog.m_category=CA2W(row[27],CP_UTF8);
+ prog.m_pathname=CA2W(row[25],CP_UTF8);
return true;
}
}
@@ -283,11 +404,11 @@
mysqlpp::Connection con(false);
if(!util.Connect(con))
{
- return false;
+ return 0;
}
mysqlpp::Query query=con.query();
query << "SELECT commflagged, cutlist, autoexpire, "
- "editing, bookmark, stereo, closecaptioned, hdtv "
+ "editing, bookmark, watched, preserve"
"FROM recorded LEFT JOIN recordedprogram ON "
"(recorded.chanid = recordedprogram.chanid AND "
"recorded.progstart = recordedprogram.starttime) "
@@ -313,16 +434,12 @@
}
if(!row.at(5).is_null())
{
- flags|=(long)row.at(5)==1 ? FL_STEREO : 0;
+ flags|=(long)row.at(5)==1 ? FL_WATCHED : 0;
}
if(!row.at(6).is_null())
{
- flags|=(long)row.at(6)==1 ? FL_CC : 0;
+ flags|=(long)row.at(6)==1 ? FL_PRESERVED : 0;
}
- if(!row.at(7).is_null())
- {
- flags|=(long)row.at(7)==1 ? FL_HDTV : 0;
- }
}
}
catch(mysqlpp::Exception &e)
@@ -333,6 +450,50 @@
return flags;
}
+void CProgramInfo::GetProgramProperties()
+{
+ CDBUtils util;
+ try
+ {
+ mysqlpp::Connection con(false);
+ if(!util.Connect(con))
+ {
+ return;
+ }
+ mysqlpp::Query query=con.query();
+ query << "SELECT audioprop+0, videoprop+0, subtitletypes+0 "
+ "FROM recorded LEFT JOIN recordedprogram ON "
+ "(recorded.chanid = recordedprogram.chanid AND "
+ "recorded.progstart = recordedprogram.starttime) "
+ "WHERE recorded.chanid = %0q:chanid AND recorded.starttime = FROM_UNIXTIME(%1q:starttime) ;";
+ query.parse();
+ query.def["chanid"]=m_chanid;
+ query.def["starttime"]=m_recstartts.GetTime();
+ mysqlpp::Result res=query.store();
+ if(res && res.num_rows()>0)
+ {
+ mysqlpp::Row row=res.at(0);
+ if(!row.at(0).is_null())
+ {
+ m_audioproperties = row.at(0);
+ }
+ if(!row.at(1).is_null())
+ {
+ m_videoproperties = row.at(1);
+ }
+ if(!row.at(2).is_null())
+ {
+ m_subtitleType = row.at(2);
+ }
+ }
+ }
+ catch(mysqlpp::Exception &e)
+ {
+ ATLTRACE(_T("%s(%d) : CProgramInfo::GetProgramFlags db exception: %s\n"),__FILE__,__LINE__,e.what());
+ return;
+ }
+}
+
void CProgramInfo::UpdateInUseMark(bool bForce)
{
if(m_inUseForWhat.GetLength()==0)
@@ -394,15 +555,17 @@
query.reset();
query << "INSERT INTO inuseprograms "
- " (chanid, starttime, recusage, hostname, lastupdatetime) "
+ " (chanid, starttime, recusage, hostname, lastupdatetime, rechost, recdir) "
" VALUES "
- " (%0q:chanid, FROM_UNIXTIME(%1q:starttime), %2q:recusage, %3q:hostname, FROM_UNIXTIME(%4q:lastupdatetime));";
+ " (%0q:chanid, FROM_UNIXTIME(%1q:starttime), %2q:recusage, %3q:hostname, FROM_UNIXTIME(%4q:lastupdatetime), %4q:rechost, %5q:recdir);";
query.parse();
query.def["chanid"]=m_chanid;
query.def["starttime"]=m_recstartts.GetTime();
query.def["recusage"]=m_inUseForWhat;
query.def["hostname"]=GetHostName();
query.def["lastupdatetime"]=m_lastInUseTime.GetTime();
+ query.def["rechost"]=GetHostName();
+ query.def["recdir"]=".";
query.execute();
}
Modified: trunk/MythTVReader/common/ProgramInfo.h
===================================================================
--- trunk/MythTVReader/common/ProgramInfo.h 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/common/ProgramInfo.h 2009-06-05 19:55:19 UTC (rev 563)
@@ -24,7 +24,7 @@
#pragma once
-#define NUMPROGRAMLINES 42
+#define NUMPROGRAMLINES 46
enum RecordingType
{
kNotRecording = 0,
@@ -50,19 +50,43 @@
enum FlagMask
{
- FL_COMMFLAG = 0x001,
- FL_CUTLIST = 0x002,
- FL_AUTOEXP = 0x004,
- FL_EDITING = 0x008,
- FL_BOOKMARK = 0x010,
- FL_INUSERECORDING = 0x020,
- FL_INUSEPLAYING = 0x040,
- FL_STEREO = 0x080,
- FL_CC = 0x100,
- FL_HDTV = 0x200,
- FL_TRANSCODED = 0x400
+ FL_COMMFLAG = 0x0001,
+ FL_CUTLIST = 0x0002,
+ FL_AUTOEXP = 0x0004,
+ FL_EDITING = 0x0008,
+ FL_BOOKMARK = 0x0010,
+ FL_INUSERECORDING = 0x0020,
+ FL_INUSEPLAYING = 0x0040,
+ FL_TRANSCODED = 0x0400,
+ FL_WATCHED = 0x0800,
+ FL_PRESERVED = 0x1000
};
+enum AudioProps {
+ AUD_UNKNOWN = 0x00,
+ AUD_STEREO = 0x01,
+ AUD_MONO = 0x02,
+ AUD_SURROUND = 0x04,
+ AUD_DOLBY = 0x08,
+ AUD_HARDHEAR = 0x10,
+ AUD_VISUALIMPAIR = 0x20,
+};
+
+enum VideoProps {
+ VID_UNKNOWN = 0x00,
+ VID_HDTV = 0x01,
+ VID_WIDESCREEN = 0x02,
+ VID_AVC = 0x04,
+};
+
+enum SubtitleTypes {
+ SUB_UNKNOWN = 0x00,
+ SUB_HARDHEAR = 0x01,
+ SUB_NORMAL = 0x02,
+ SUB_ONSCREEN = 0x04,
+ SUB_SIGNED = 0x08
+};
+
enum RecStatusType
{
rsFailed = -9,
@@ -86,7 +110,8 @@
rsRepeat = 9,
rsInactive = 10,
rsNeverRecord = 11,
- rsOffLine = 12
+ rsOffLine = 12,
+ rsOtherShowing = 13
};
enum RecordingDupInType
@@ -119,6 +144,7 @@
bool FromString(const CAtlString &str);
bool FromList(CAtlArray<CAtlString> &list,unsigned int offset);
+ void ToList(CAtlArray<CAtlString> &list);
void ToString(CAtlString &str);
static bool GetProgramFromRecorded(const CAtlString &channel,const CTime &starttime,CProgramInfo &prog);
static bool GetProgramFromRecorded(const CAtlString &channel,const CAtlString &starttime,CProgramInfo &prog);
@@ -143,9 +169,10 @@
CAtlStringW m_playgroup;
int m_chancommfree;
- CAtlString m_pathname;
+ CAtlStringW m_pathname;
LONGLONG m_filesize;
CAtlString m_hostname;
+ CAtlStringW m_storagegroup;
CTime m_startts;
CTime m_endts;
@@ -156,7 +183,6 @@
bool m_repeat;
RecStatusType m_recstatus;
- RecStatusType m_savedrecstatus;
int m_recordid;
RecordingType m_rectype;
RecordingDupInType m_dupin;
@@ -171,6 +197,10 @@
int m_findid;
int m_programflags;
+ int m_subtitleType;
+ int m_videoproperties;
+ int m_audioproperties;
+ int m_transcoder;
CAtlString m_chanoutputfilters;
CAtlString m_seriesid;
@@ -185,5 +215,6 @@
private:
int GetProgramFlags(void) const;
+ void GetProgramProperties(void);
CAtlString m_inUseForWhat;
};
Modified: trunk/MythTVReader/common/SeekTable.cpp
===================================================================
--- trunk/MythTVReader/common/SeekTable.cpp 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/common/SeekTable.cpp 2009-06-05 19:55:19 UTC (rev 563)
@@ -247,12 +247,19 @@
rtframeheader seekframe;
ZeroMemory(&seekframe,FRAMEHEADERSIZE);
hr=m_pReader->Seek(offset);
- ATLASSERT(hr==S_OK);
+ if(FAILED(hr))
+ {
+ return false;
+ }
hr=m_pReader->Read((void*)&seekframe,FRAMEHEADERSIZE,dwBytesRead);
- ATLASSERT(hr==S_OK);
+ if(FAILED(hr))
+ {
+ return false;
+ }
if(seekframe.frametype!='Q')
{
//invalid seek table
+ ATLTRACE(_T("%s(%d) : CSeekTable::ReadFileSeekTable Invalid or missing seek table!\n"),__FILE__,__LINE__);
return false;
}
Modified: trunk/MythTVReader/common/util.h
===================================================================
--- trunk/MythTVReader/common/util.h 2009-06-05 19:35:48 UTC (rev 562)
+++ trunk/MythTVReader/common/util.h 2009-06-05 19:55:19 UTC (rev 563)
@@ -23,7 +23,7 @@
*/
#include "Socket.h"
#pragma once
-#define MYTH_PROTO_VERSION 31
+#define MYTH_PROTO_VERSION 40
template<typename T>
void SplitString(const CAtlString str,T &list,CAtlString token="[]:[]")
@@ -47,6 +47,21 @@
}
}
+template<typename T>
+void JoinString(CAtlString &str, const T &list,CAtlString token="[]:[]")
+{
+ CAtlString tmp;
+ for(size_t i=0;i<list.GetCount();i++)
+ {
+ if(i!=0)
+ {
+ tmp+=token;
+ }
+ tmp+=list[i];
+ }
+ str=tmp;
+}
+
bool SendCommand(CSocket &sock,CAtlString &cmd);
bool SendCommand(CSocket &sock,CAtlString &cmd,CAtlString &Response);
bool GetResponse(CSocket &sock,CAtlString &Response,bool bUseTimeout=false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2009-06-05 19:36:31
|
Revision: 562
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=562&view=rev
Author: tobbej
Date: 2009-06-05 19:35:48 +0000 (Fri, 05 Jun 2009)
Log Message:
-----------
some minor changes to properties
Property Changed:
----------------
trunk/MythTVReader/
trunk/MythTVReader/Shell/PropertyHandler/
Property changes on: trunk/MythTVReader
___________________________________________________________________
Modified: svn:ignore
- MythTVReader.suo
MythTVReader.ncb
ChangeLog
+ MythTVReader.suo
MythTVReader.ncb
ChangeLog
_UpgradeReport_Files
UpgradeLog.XML
Property changes on: trunk/MythTVReader/Shell/PropertyHandler
___________________________________________________________________
Modified: svn:ignore
- Debug
Release
*.aps
PropertyHandler_i.c
PropertyHandler_p.c
PropertyHandler.h
dlldata.c
*.user
+ Debug
Release
*.aps
PropertyHandler_i.c
PropertyHandler_p.c
PropertyHandler.h
dlldata.c
*.user
DebugPS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2009-06-05 13:22:29
|
Revision: 561
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=561&view=rev
Author: tobbej
Date: 2009-06-05 13:22:19 +0000 (Fri, 05 Jun 2009)
Log Message:
-----------
workaround for missing dxtrans.h in some of the windows sdks
Modified Paths:
--------------
trunk/MythTVReader/MythSource/SeekPin.cpp
Modified: trunk/MythTVReader/MythSource/SeekPin.cpp
===================================================================
--- trunk/MythTVReader/MythSource/SeekPin.cpp 2009-06-04 21:27:12 UTC (rev 560)
+++ trunk/MythTVReader/MythSource/SeekPin.cpp 2009-06-05 13:22:19 UTC (rev 561)
@@ -26,6 +26,13 @@
#include "SeekPin.h"
#include "MemOutPin.h"
#include "AutoLockCriticalSection.h"
+
+//workaround for missing dxtrans.h in the windows sdk
+#pragma include_alias( "dxtrans.h", "qedit.h" )
+#define __IDxtCompositor_INTERFACE_DEFINED__
+#define __IDxtAlphaSetter_INTERFACE_DEFINED__
+#define __IDxtJpeg_INTERFACE_DEFINED__
+#define __IDxtKey_INTERFACE_DEFINED__
#include <qedit.h>
// CSeekPin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2009-06-04 21:27:21
|
Revision: 560
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=560&view=rev
Author: tobbej
Date: 2009-06-04 21:27:12 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
Update project files to VS 2008
(forgot one file)
Modified Paths:
--------------
trunk/MythTVReader/MythTVReader.sln
Modified: trunk/MythTVReader/MythTVReader.sln
===================================================================
--- trunk/MythTVReader/MythTVReader.sln 2009-06-04 21:26:24 UTC (rev 559)
+++ trunk/MythTVReader/MythTVReader.sln 2009-06-04 21:27:12 UTC (rev 560)
@@ -1,5 +1,13 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shell", "Shell", "{3A7F1B91-7B97-4142-BCAC-4D13A34F835A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Filter", "Filter", "{19A276D9-CD21-45D3-8EF0-C1C04AD88B30}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{7C3AD37A-4882-496C-B58A-30ED91163101}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{1CC5D4BE-25DF-4811-9948-A31030411E25}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSMyth", "DSMyth\DSMyth.vcproj", "{F6B27C5D-7691-4815-81A0-0C224E72398B}"
ProjectSection(ProjectDependencies) = postProject
{5F161F3E-2B8B-4C77-8572-41007C10A02A} = {5F161F3E-2B8B-4C77-8572-41007C10A02A}
@@ -49,14 +57,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlpp", "libs\mysql++\mysql++_mysqlpp.vcproj", "{366D3D7C-DEED-4F5E-B506-3B235AB0B75C}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shell", "Shell", "{3A7F1B91-7B97-4142-BCAC-4D13A34F835A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Filter", "Filter", "{19A276D9-CD21-45D3-8EF0-C1C04AD88B30}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{7C3AD37A-4882-496C-B58A-30ED91163101}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{1CC5D4BE-25DF-4811-9948-A31030411E25}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToolTip", "Shell\ToolTip\ToolTip.vcproj", "{C9FE1F43-9505-4F22-AF52-D732A2CB8EB1}"
ProjectSection(ProjectDependencies) = postProject
{8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {8A693FB2-FAA6-407B-80C7-08C5C48C5381}
@@ -119,17 +119,17 @@
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {D5CC2DA7-33FD-4ACD-B0ED-E32418612331} = {19A276D9-CD21-45D3-8EF0-C1C04AD88B30}
- {5F161F3E-2B8B-4C77-8572-41007C10A02A} = {19A276D9-CD21-45D3-8EF0-C1C04AD88B30}
- {F6B27C5D-7691-4815-81A0-0C224E72398B} = {19A276D9-CD21-45D3-8EF0-C1C04AD88B30}
+ {A25C39EC-460F-4992-A46A-A8E07F47F98B} = {3A7F1B91-7B97-4142-BCAC-4D13A34F835A}
{B71EB910-12E4-4C96-B0C2-5284188F2C9D} = {3A7F1B91-7B97-4142-BCAC-4D13A34F835A}
{F65AED6A-743C-4E23-A6B3-C17F4A19196B} = {3A7F1B91-7B97-4142-BCAC-4D13A34F835A}
- {A25C39EC-460F-4992-A46A-A8E07F47F98B} = {3A7F1B91-7B97-4142-BCAC-4D13A34F835A}
{C9FE1F43-9505-4F22-AF52-D732A2CB8EB1} = {3A7F1B91-7B97-4142-BCAC-4D13A34F835A}
+ {F6B27C5D-7691-4815-81A0-0C224E72398B} = {19A276D9-CD21-45D3-8EF0-C1C04AD88B30}
+ {D5CC2DA7-33FD-4ACD-B0ED-E32418612331} = {19A276D9-CD21-45D3-8EF0-C1C04AD88B30}
+ {5F161F3E-2B8B-4C77-8572-41007C10A02A} = {19A276D9-CD21-45D3-8EF0-C1C04AD88B30}
+ {4F964E4A-B778-4173-94A6-EAC25FD43885} = {7C3AD37A-4882-496C-B58A-30ED91163101}
{86F43618-AE3C-481F-881F-F9871437A0FA} = {7C3AD37A-4882-496C-B58A-30ED91163101}
- {4F964E4A-B778-4173-94A6-EAC25FD43885} = {7C3AD37A-4882-496C-B58A-30ED91163101}
+ {8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {1CC5D4BE-25DF-4811-9948-A31030411E25}
{4E805F8C-4927-43D8-B6E4-C8F82AF670C3} = {1CC5D4BE-25DF-4811-9948-A31030411E25}
{366D3D7C-DEED-4F5E-B506-3B235AB0B75C} = {1CC5D4BE-25DF-4811-9948-A31030411E25}
- {8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {1CC5D4BE-25DF-4811-9948-A31030411E25}
EndGlobalSection
EndGlobal
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2009-06-04 21:26:39
|
Revision: 559
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=559&view=rev
Author: tobbej
Date: 2009-06-04 21:26:24 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
Update project files to VS 2008
Modified Paths:
--------------
trunk/MythTVReader/Config/Config.vcproj
trunk/MythTVReader/DSMyth/DSMyth.vcproj
trunk/MythTVReader/MythSource/MythSource.vcproj
trunk/MythTVReader/NuvConv/NuvConv.vcproj
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.vcproj
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.vcproj
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandlerPS.vcproj
trunk/MythTVReader/Shell/ToolTip/ToolTip.vcproj
trunk/MythTVReader/common/common.vcproj
trunk/MythTVReader/libs/libdvbpsi/vc++/libdvbpsi.vcproj
trunk/MythTVReader/libs/mysql++/mysql++_mysqlpp.vcproj
trunk/MythTVReader/rtjpg/rtjpg.vcproj
Modified: trunk/MythTVReader/Config/Config.vcproj
===================================================================
--- trunk/MythTVReader/Config/Config.vcproj 2008-06-29 15:29:09 UTC (rev 558)
+++ trunk/MythTVReader/Config/Config.vcproj 2009-06-04 21:26:24 UTC (rev 559)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="Config"
ProjectGUID="{4F964E4A-B778-4173-94A6-EAC25FD43885}"
RootNamespace="Config"
Keyword="MFCProj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -51,7 +52,6 @@
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -72,6 +72,8 @@
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -93,9 +95,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -136,7 +135,6 @@
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -159,6 +157,8 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -180,9 +180,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
Modified: trunk/MythTVReader/DSMyth/DSMyth.vcproj
===================================================================
--- trunk/MythTVReader/DSMyth/DSMyth.vcproj 2008-06-29 15:29:09 UTC (rev 558)
+++ trunk/MythTVReader/DSMyth/DSMyth.vcproj 2009-06-04 21:26:24 UTC (rev 559)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="DSMyth"
ProjectGUID="{F6B27C5D-7691-4815-81A0-0C224E72398B}"
RootNamespace="DSMyth"
Keyword="AtlProj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -80,6 +81,8 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -101,9 +104,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -171,6 +171,8 @@
ModuleDefinitionFile=".\DSMyth.def"
GenerateDebugInformation="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -192,9 +194,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
Modified: trunk/MythTVReader/MythSource/MythSource.vcproj
===================================================================
--- trunk/MythTVReader/MythSource/MythSource.vcproj 2008-06-29 15:29:09 UTC (rev 558)
+++ trunk/MythTVReader/MythSource/MythSource.vcproj 2009-06-04 21:26:24 UTC (rev 559)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="MythSource"
ProjectGUID="{5F161F3E-2B8B-4C77-8572-41007C10A02A}"
RootNamespace="MythSource"
Keyword="AtlProj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -62,7 +63,6 @@
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -87,6 +87,8 @@
ModuleDefinitionFile=".\MythSource.def"
GenerateDebugInformation="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(OutDir)/MythSource.lib"
TargetMachine="1"
/>
@@ -109,9 +111,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
@@ -164,7 +163,6 @@
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -191,6 +189,8 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(OutDir)/MythSource.lib"
TargetMachine="1"
/>
@@ -213,9 +213,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
Modified: trunk/MythTVReader/NuvConv/NuvConv.vcproj
===================================================================
--- trunk/MythTVReader/NuvConv/NuvConv.vcproj 2008-06-29 15:29:09 UTC (rev 558)
+++ trunk/MythTVReader/NuvConv/NuvConv.vcproj 2009-06-04 21:26:24 UTC (rev 559)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="NuvConv"
ProjectGUID="{86F43618-AE3C-481F-881F-F9871437A0FA}"
RootNamespace="NuvConv"
Keyword="MFCProj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -52,7 +53,6 @@
TreatWChar_tAsBuiltInType="true"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -73,6 +73,8 @@
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -94,9 +96,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -135,7 +134,6 @@
TreatWChar_tAsBuiltInType="true"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -158,6 +156,8 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -179,9 +179,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
Modified: trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.vcproj
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.vcproj 2008-06-29 15:29:09 UTC (rev 558)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.vcproj 2009-06-04 21:26:24 UTC (rev 559)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="NuvPropPage"
ProjectGUID="{A25C39EC-460F-4992-A46A-A8E07F47F98B}"
RootNamespace="NuvPropPage"
Keyword="AtlProj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -60,7 +61,6 @@
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -86,6 +86,8 @@
ModuleDefinitionFile=".\NuvPropPage.def"
GenerateDebugInformation="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(OutDir)/NuvPropPage.lib"
TargetMachine="1"
/>
@@ -108,9 +110,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
@@ -159,7 +158,6 @@
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -187,6 +185,8 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(OutDir)/NuvPropPage.lib"
TargetMachine="1"
/>
@@ -209,9 +209,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
Modified: trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.vcproj
===================================================================
--- trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.vcproj 2008-06-29 15:29:09 UTC (rev 558)
+++ trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.vcproj 2009-06-04 21:26:24 UTC (rev 559)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="PropertyHandler"
ProjectGUID="{B71EB910-12E4-4C96-B0C2-5284188F2C9D}"
RootNamespace="PropertyHandler"
Keyword="AtlProj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -59,7 +60,6 @@
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -83,6 +83,8 @@
ModuleDefinitionFile=".\PropertyHandler.def"
GenerateDebugInformation="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -104,9 +106,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -152,7 +151,6 @@
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -178,6 +176,8 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -199,9 +199,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
Modified: trunk/MythTVReader/Shell/PropertyHandler/PropertyHandlerPS.vcproj
===================================================================
--- trunk/MythTVReader/Shell/PropertyHandler/PropertyHandlerPS.vcproj 2008-06-29 15:29:09 UTC (rev 558)
+++ trunk/MythTVReader/Shell/PropertyHandler/PropertyHandlerPS.vcproj 2009-06-04 21:26:24 UTC (rev 559)
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="PropertyHandlerPS"
ProjectGUID="{F65AED6A-743C-4E23-A6B3-C17F4A19196B}"
Keyword="AtlPSProj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -57,6 +58,8 @@
RegisterOutput="true"
AdditionalDependencies="kernel32.lib rpcndr.lib rpcns4.lib rpcrt4.lib oleaut32.lib uuid.lib"
ModuleDefinitionFile="PropertyHandlerPS.def"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
@@ -77,9 +80,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -129,6 +129,8 @@
ModuleDefinitionFile="PropertyHandlerPS.def"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
@@ -149,9 +151,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
Modified: trunk/MythTVReader/Shell/ToolTip/ToolTip.vcproj
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/ToolTip.vcproj 2008-06-29 15:29:09 UTC (rev 558)
+++ trunk/MythTVReader/Shell/ToolTip/ToolTip.vcproj 2009-06-04 21:26:24 UTC (rev 559)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="ToolTip"
ProjectGUID="{C9FE1F43-9505-4F22-AF52-D732A2CB8EB1}"
RootNamespace="ToolTip"
Keyword="AtlProj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -59,7 +60,6 @@
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -83,6 +83,8 @@
ModuleDefinitionFile=".\ToolTip.def"
GenerateDebugInformation="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -104,9 +106,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -152,7 +151,6 @@
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -178,6 +176,8 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -199,9 +199,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
Modified: trunk/MythTVReader/common/common.vcproj
===================================================================
--- trunk/MythTVReader/common/common.vcproj 2008-06-29 15:29:09 UTC (rev 558)
+++ trunk/MythTVReader/common/common.vcproj 2009-06-04 21:26:24 UTC (rev 559)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="common"
ProjectGUID="{8A693FB2-FAA6-407B-80C7-08C5C48C5381}"
RootNamespace="common"
Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,6 @@
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -110,7 +110,6 @@
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Modified: trunk/MythTVReader/libs/libdvbpsi/vc++/libdvbpsi.vcproj
===================================================================
--- trunk/MythTVReader/libs/libdvbpsi/vc++/libdvbpsi.vcproj 2008-06-29 15:29:09 UTC (rev 558)
+++ trunk/MythTVReader/libs/libdvbpsi/vc++/libdvbpsi.vcproj 2009-06-04 21:26:24 UTC (rev 559)
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="libdvbpsi"
ProjectGUID="{4E805F8C-4927-43D8-B6E4-C8F82AF670C3}"
RootNamespace="libdvbpsi"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Modified: trunk/MythTVReader/libs/mysql++/mysql++_mysqlpp.vcproj
===================================================================
--- trunk/MythTVReader/libs/mysql++/mysql++_mysqlpp.vcproj 2008-06-29 15:29:09 UTC (rev 558)
+++ trunk/MythTVReader/libs/mysql++/mysql++_mysqlpp.vcproj 2009-06-04 21:26:24 UTC (rev 559)
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="mysqlpp"
ProjectGUID="{366D3D7C-DEED-4F5E-B506-3B235AB0B75C}"
RootNamespace="mysqlpp"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -77,6 +78,8 @@
LinkIncremental="2"
AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -98,9 +101,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -164,6 +164,8 @@
AdditionalLibraryDirectories=""
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -185,9 +187,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
Modified: trunk/MythTVReader/rtjpg/rtjpg.vcproj
===================================================================
--- trunk/MythTVReader/rtjpg/rtjpg.vcproj 2008-06-29 15:29:09 UTC (rev 558)
+++ trunk/MythTVReader/rtjpg/rtjpg.vcproj 2009-06-04 21:26:24 UTC (rev 559)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="rtjpg"
ProjectGUID="{D5CC2DA7-33FD-4ACD-B0ED-E32418612331}"
RootNamespace="rtjpg"
Keyword="AtlProj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -59,7 +60,6 @@
ForceConformanceInForLoopScope="false"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -84,6 +84,8 @@
ModuleDefinitionFile=".\rtjpg.def"
GenerateDebugInformation="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(OutDir)/rtjpg.lib"
TargetMachine="1"
/>
@@ -106,9 +108,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
@@ -158,7 +157,6 @@
ForceConformanceInForLoopScope="false"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -185,6 +183,8 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(OutDir)/rtjpg.lib"
TargetMachine="1"
/>
@@ -207,9 +207,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-06-29 15:29:25
|
Revision: 558
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=558&view=rev
Author: tobbej
Date: 2008-06-29 08:29:09 -0700 (Sun, 29 Jun 2008)
Log Message:
-----------
mpg related registry changes to installer.
updated swedish translation file.
Modified Paths:
--------------
trunk/MythTVReader/InnoSetup/setup.iss
Added Paths:
-----------
trunk/MythTVReader/InnoSetup/Swedish-10-5.1.12.isl
Removed Paths:
-------------
trunk/MythTVReader/InnoSetup/Swedish-8-4.2.1.isl
Added: trunk/MythTVReader/InnoSetup/Swedish-10-5.1.12.isl
===================================================================
--- trunk/MythTVReader/InnoSetup/Swedish-10-5.1.12.isl (rev 0)
+++ trunk/MythTVReader/InnoSetup/Swedish-10-5.1.12.isl 2008-06-29 15:29:09 UTC (rev 558)
@@ -0,0 +1,310 @@
+;Hans Eriksson
+[LangOptions]
+
+;*** Inno Setup version 5.1.12+ Swedish messages ***
+;
+; Translated by st...@bo...
+; Translated by han...@br...
+;
+LanguageName=Svenska
+LanguageID=$041D
+LanguageCodePage=0
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Installationsprogram
+SetupWindowTitle=Installationsprogram f\xF6r %1
+UninstallAppTitle=Avinstallation
+UninstallAppFullTitle=%1 Avinstallation
+
+; *** Misc. common
+InformationTitle=Information
+ConfirmTitle=Bekr\xE4fta
+ErrorTitle=Fel
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=%1 kommer att installeras. Vill du forts\xE4tta?
+LdrCannotCreateTemp=Kan ej skapa en tempor\xE4r fil. Installationen avbryts
+LdrCannotExecTemp=Kan inte k\xF6ra fil i tempor\xE4r katalog. Installationen avbryts
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nFel %2: %3
+SetupFileMissing=Filen %1 saknas i installationskatalogen. R\xE4tta till problemet eller h\xE4mta en ny kopia av programmet.
+SetupFileCorrupt=Installationsfilerna \xE4r felaktiga. H\xE4mta en ny kopia av programmet
+SetupFileCorruptOrWrongVer=Installationsfilerna \xE4r felaktiga, eller st\xE4mmer ej \xF6verens med denna version av installationsprogrammet. R\xE4tta till felet eller h\xE4mta en ny programkopia.
+NotOnThisPlatform=Detta program kan ej k\xF6ras p\xE5 %1.
+OnlyOnThisPlatform=Detta program m\xE5ste ha %1.
+OnlyOnTheseArchitectures=Detta program kan bara installeras p\xE5 Windows versioner med f\xF6ljande processorarkitekturer:%n%n%1
+MissingWOW64APIs=Den versionen av Windows du k\xF6r har inte den funktionalitet installationsprogrammet beh\xF6ver f\xF6r att genomf\xF6ra en 64-bitars installation. R\xE4tta till problemet genom att installera Service Pack %1.
+WinVersionTooLowError=Detta program kr\xE4ver %1, version %2 eller senare.
+WinVersionTooHighError=Programmet kan inte installeras p\xE5 %1 version %2 eller senare.
+AdminPrivilegesRequired=Du m\xE5ste vara inloggad som administrat\xF6r n\xE4r du installerar detta program.
+PowerUserPrivilegesRequired=Du m\xE5ste vara inloggad som administrat\xF6r eller medlem av gruppen Privilegierade anv\xE4ndare (Power Users) n\xE4r du installerar detta program.
+SetupAppRunningError=Installationsprogrammet har uppt\xE4ckt att %1 \xE4r ig\xE5ng.%n%nAvsluta det angivna programmet nu. Klicka sedan p\xE5 OK f\xF6r att g\xE5 vidare, eller p\xE5 Avbryt f\xF6r att avsluta.
+UninstallAppRunningError=Avinstalleraren har uppt\xE4ckt att %1 k\xF6rs f\xF6r tillf\xE4llet.%n%nSt\xE4ng all \xF6ppna instanser av det nu, klicka sedan p\xE5 OK f\xF6r att g\xE5 vidare, eller p\xE5 Avbryt f\xF6r att avsluta.
+
+; *** Misc. errors
+ErrorCreatingDir=Kunde inte skapa katalogen "%1"
+ErrorTooManyFilesInDir=Kunde inte skapa en fil i katalogen "%1" d\xE4rf\xF6r att den inneh\xE5ller f\xF6r m\xE5nga filer
+
+; *** Setup common messages
+ExitSetupTitle=Avsluta installationen
+ExitSetupMessage=Installationen \xE4r inte f\xE4rdig. Om du avslutar nu, kommer programmet inte att installeras.%n%nDu kan k\xF6ra installationsprogrammet vid ett senare tillf\xE4lle f\xF6r att slutf\xF6ra installationen.%n%nVill du avbryta installationen?
+AboutSetupMenuItem=&Om installationsprogrammet...
+AboutSetupTitle=Om installationsprogrammet
+AboutSetupMessage=%1 version %2%n%3%n%n%1 hemsida:%n%4
+AboutSetupNote=Svensk \xF6vers\xE4ttning \xE4r gjord av di...@go... 1999, 2002%n%nUppdatering till 3.0.2+ av pe...@pe..., 4.+ av st...@bo...
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< &Tillbaka
+ButtonNext=&N\xE4sta >
+ButtonInstall=&Installera
+ButtonOK=OK
+ButtonCancel=Avbryt
+ButtonYes=&Ja
+ButtonYesToAll=Ja till &Allt
+ButtonNo=&Nej
+ButtonNoToAll=N&ej till allt
+ButtonFinish=&Slutf\xF6r
+ButtonBrowse=&Bl\xE4ddra...
+ButtonWizardBrowse=&Bl\xE4ddra...
+ButtonNewFolder=Skapa ny katalog
+SelectLanguageTitle=V\xE4lj spr\xE5k f\xF6r installationen
+SelectLanguageLabel=V\xE4lj spr\xE5k som skall anv\xE4ndas under installationen:
+
+; *** Common wizard text
+ClickNext=Klicka p\xE5 N\xE4sta f\xF6r att forts\xE4tta eller p\xE5 Avbryt f\xF6r att avsluta installationen.
+BeveledLabel=
+BrowseDialogTitle=V\xE4lj katalog
+BrowseDialogLabel=V\xE4lj en katalog i listan nedan, klicka sedan p\xE5 OK.
+NewFolderName=Ny katalog
+
+; *** "Welcome" wizard page
+;WizardWelcome=V\xE4lkommen
+;WelcomeLabel1=V\xE4lkommen till installationsprogrammet f\xF6r [name].
+;WelcomeLabel2=Detta kommer att installera [name/ver] p\xE5 din dator.%n%nDet rekommenderas att du avslutar alla andra program innan du forts\xE4tter. Det f\xF6rebygger konflikter under installationens g\xE5ng.
+; *** "Password" wizard page
+WelcomeLabel1=V\xE4lkommen till installationen av [name]
+WelcomeLabel2=Installationsprogrammet kommer att installera [name/ver] p\xE5 din dator.
+WizardPassword=L\xF6senord
+PasswordLabel1=Denna installation \xE4r skyddad med l\xF6senord.
+PasswordLabel3=Var god ange l\xF6senordet, klicka sedan p\xE5 N\xE4sta f\xF6r att forts\xE4tta. L\xF6senord skiljer p\xE5 versaler/gemener.
+PasswordEditLabel=&L\xF6senord:
+IncorrectPassword=L\xF6senordet du angav \xE4r inkorrekt. F\xF6rs\xF6k igen.
+
+; *** "License Agreement" wizard page
+WizardLicense=Licensavtal
+LicenseLabel=Var god och l\xE4s f\xF6ljande viktiga information innan du forts\xE4tter.
+LicenseLabel3=Var god och l\xE4s f\xF6ljande licensavtal. Du m\xE5ste acceptera villkoren i avtalet innan du kan forts\xE4tta med installationen.
+LicenseAccepted=Jag &accepterar avtalet
+LicenseNotAccepted=Jag accepterar &inte avtalet
+
+; *** "Information" wizard pages
+WizardInfoBefore=Information
+InfoBeforeLabel=Var god l\xE4s f\xF6ljande viktiga information innan du forts\xE4tter.
+InfoBeforeClickLabel=N\xE4r du \xE4r klar att forts\xE4tta med installationen klickar du p\xE5 N\xE4sta.
+WizardInfoAfter=Information
+InfoAfterLabel=Var god l\xE4s f\xF6ljande viktiga information innan du forts\xE4tter.
+InfoAfterClickLabel=N\xE4r du \xE4r klar att forts\xE4tta med installationen klickar du p\xE5 N\xE4sta.
+
+; *** "User Information" wizard page
+WizardUserInfo=Anv\xE4ndarinformation
+UserInfoDesc=Var god och fyll i f\xF6ljande uppgifter.
+UserInfoName=&Namn:
+UserInfoOrg=&Organisation:
+UserInfoSerial=&Serienummer:
+UserInfoNameRequired=Du m\xE5ste fylla i ett namn.
+
+; *** "Select Destination Directory" wizard page
+WizardSelectDir=V\xE4lj installationsplats
+SelectDirDesc=Var skall [name] installeras?
+SelectDirLabel3=Installationsprogrammet kommer att installera [name] i f\xF6ljande katalog
+SelectDirBrowseLabel=F\xF6r att forts\xE4tta klickar du p\xE5 N\xE4sta. Om du vill v\xE4lja en annan katalog klickar du p\xE5 Bl\xE4ddra.
+DiskSpaceMBLabel=Programmet kr\xE4ver minst [mb] MB h\xE5rddiskutrymme.
+ToUNCPathname=Installationsprogrammet kan inte installera till UNC s\xF6kv\xE4g. Om du f\xF6rs\xF6ker installera via ett n\xE4tverk, ska du ange n\xE4tverksenheten.
+InvalidPath=Du m\xE5ste skriva en fullst\xE4ndig s\xF6kv\xE4g med enhetsbeteckning; till exempel:%C:\APP
+InvalidDrive=Enheten du har valt finns inte eller \xE4r inte tillg\xE4nglig. V\xE4lj en annan.
+DiskSpaceWarningTitle=Ej tillr\xE4ckligt med diskutrymme
+DiskSpaceWarning=Installationsprogrammet beh\xF6ver \xE5tminstone %1 KB ledigt diskutrymme f\xF6r installationen, men den valda enheten har bara %2 KB tillg\xE4ngligt.%n%nVill du forts\xE4tta \xE4nd\xE5?
+DirNameTooLong=Katalogens namn eller s\xF6kv\xE4g \xE4r f\xF6r l\xE5ng.
+InvalidDirName=Katalogen du har valt \xE4r inte tillg\xE4nglig.
+BadDirName32=Katalogens namn f\xE5r ej inneh\xE5lla n\xE5got av f\xF6ljande tecken:%n%n%1
+DirExistsTitle=Katalogen finns
+DirExists=Katalogen:%n%n%1%n%nfinns redan. Vill du \xE4nd\xE5 forts\xE4tta installationen till den valda katalogen?
+DirDoesntExistTitle=Katalogen finns inte
+DirDoesntExist=Katalogen:%n%n%1%n%nfinns inte. Vill du skapa den?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=V\xE4lj komponenter
+SelectComponentsDesc=Vilka komponenter skall installeras?
+SelectComponentsLabel2=V\xE4lj de komponenter som du vill ska installeras; avmarkera de komponenter som du inte vill ha. Klicka sedan p\xE5 N\xE4sta n\xE4r du \xE4r klar att forts\xE4tta.
+FullInstallation=Fullst\xE4ndig installation
+
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Kompakt installation
+CustomInstallation=Anpassad installation
+NoUninstallWarningTitle=Komponenter finns
+NoUninstallWarning=Installationsprogrammet har uppt\xE4ckt att f\xF6ljande komponenter redan finns installerade p\xE5 din dator:%n%n%1%n%nAtt avmarkera dessa komponenter kommer inte att avinstallera dom.%n%nVill du forts\xE4tta \xE4nd\xE5?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Aktuella val kr\xE4ver minst [mb] MB diskutrymme.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=V\xE4lj extra uppgifter
+SelectTasksDesc=Vilka extra uppgifter skall utf\xF6ras?
+SelectTasksLabel2=Markera ytterligare uppgifter att utf\xF6ra vid installation av [name], tryck sedan p\xE5 N\xE4sta.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=V\xE4lj Startmenykatalogen
+SelectStartMenuFolderDesc=Var skall installationsprogrammet placera programmets genv\xE4gar?
+SelectStartMenuFolderLabel3=Installationsprogrammet kommer att skapa programmets genv\xE4gar i f\xF6ljande katalog.
+SelectStartMenuFolderBrowseLabel=F\xF6r att forts\xE4tta klickar du p\xE5 N\xE4sta. Om du vill v\xE4lja en annan katalog, klickar du p\xE5 Bl\xE4ddra.
+MustEnterGroupName=Du m\xE5ste ange en katalog.
+GroupNameTooLong=Katalogens namn eller s\xF6kv\xE4g \xE4r f\xF6r l\xE5ng.
+InvalidGroupName=Katalogen du har valt \xE4r inte tillg\xE4nglig.
+BadGroupName=Katalognamnet kan inte inneh\xE5lla n\xE5gon av f\xF6ljande tecken:%n%n%1
+NoProgramGroupCheck2=&Skapa ingen Startmenykatalog
+
+; *** "Ready to Install" wizard page
+WizardReady=Redo att installera
+ReadyLabel1=Installationsprogrammet \xE4r nu redo att installera [name] p\xE5 din dator.
+ReadyLabel2a=Tryck p\xE5 Installera om du vill forts\xE4tta, eller p\xE5 g\xE5 Tillbaka om du vill granska eller \xE4ndra p\xE5 n\xE5got.
+ReadyLabel2b=V\xE4lj Installera f\xF6r att p\xE5b\xF6rja installationen.
+ReadyMemoUserInfo=Anv\xE4ndarinformation:
+ReadyMemoDir=Installationsplats:
+ReadyMemoType=Installationstyp:
+ReadyMemoComponents=Valda komponenter:
+ReadyMemoGroup=Startmenykatalog:
+ReadyMemoTasks=Extra uppgifter:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=F\xF6rbereder installationen
+PreparingDesc=Installationsprogrammet f\xF6rbereder installationen av [name] p\xE5 din dator.
+PreviousInstallNotCompleted=Installationen/avinstallationen av ett tidigare program har inte slutf\xF6rts. Du m\xE5ste starta om datorn f\xF6r att avsluta den installationen.%n%nEfter att ha startat om datorn k\xF6r du installationsprogrammet igen f\xF6r att slutf\xF6ra installationen av [name].
+CannotContinue=Installationsprogrammet kan inte forts\xE4tta. Klicka p\xE5 Avbryt f\xF6r att avsluta.
+
+; *** "Installing" wizard page
+WizardInstalling=Installerar
+InstallingLabel=V\xE4nta medan [name] installeras p\xE5 din dator.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Avslutar installationen av [name]
+FinishedLabelNoIcons=[name] har nu installerats p\xE5 din dator.
+FinishedLabel=[name] har nu installerats p\xE5 din dator. Programmet kan startas genom att v\xE4lja n\xE5gon av ikonerna.
+ClickFinish=V\xE4lj Slutf\xF6r f\xF6r att avsluta installationen.
+FinishedRestartLabel=F\xF6r att slutf\xF6ra installationen av [name], m\xE5ste datorn startas om. Vill du starta om nu?
+FinishedRestartMessage=F\xF6r att slutf\xF6ra installationen av [name], m\xE5ste datorn startas om.%n%nVill du starta om datorn nu?
+ShowReadmeCheck=Ja, jag vill se filen L\xC4S MIG
+YesRadio=&Ja, jag vill starta om datorn nu
+NoRadio=&Nej, jag startar sj\xE4lv om datorn senare
+
+; used for example as 'Run MyProg.exe'
+RunEntryExec=K\xF6r %1
+
+; used for example as 'View Readme.txt'
+RunEntryShellExec=L\xE4s %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Installationsprogrammet beh\xF6ver n\xE4sta diskett
+SelectDiskLabel2=Var god s\xE4tt i diskett %1 och tryck OK.%n%nOm filerna kan hittas i en annan katalog \xE4n den som visas nedan, skriv in r\xE4tt s\xF6kv\xE4g eller v\xE4lj Bl\xE4ddra.
+PathLabel=&S\xF6kv\xE4g:
+FileNotInDir2=Kunde inte hitta filen "%1" i "%2". Var god s\xE4tt i korrekt diskett eller v\xE4lj en annan katalog.
+SelectDirectoryLabel=Var god ange s\xF6kv\xE4gen f\xF6r n\xE4sta diskett.
+
+; *** Installation phase messages
+SetupAborted=Installationen slutf\xF6rdes inte.%n%nVar god r\xE4tta till felet och k\xF6r installationen igen.
+EntryAbortRetryIgnore=V\xE4lj F\xF6rs\xF6k igen eller Ignorera f\xF6r att forts\xE4tta \xE4nd\xE5, eller v\xE4lj Avbryt f\xF6r att avbryta installationen.
+
+; *** Installation status messages
+StatusCreateDirs=Skapar kataloger...
+StatusExtractFiles=Packar upp filer...
+StatusCreateIcons=Skapar programikoner...
+StatusCreateIniEntries=Skriver INI-v\xE4rden...
+StatusCreateRegistryEntries=Skriver register-v\xE4rden...
+StatusRegisterFiles=Registrerar filer...
+StatusSavingUninstall=Sparar information f\xF6r avinstallation...
+StatusRunProgram=Slutf\xF6r installationen...
+StatusRollback=\xC5terst\xE4ller \xE4ndringar...
+
+; *** Misc. errors
+ErrorInternal2=Internt fel: %1
+ErrorFunctionFailedNoCode=%1 misslyckades
+ErrorFunctionFailed=%1 misslyckades; kod %2
+ErrorFunctionFailedWithMessage=%1 misslyckades; kod %2.%n%3
+ErrorExecutingProgram=Kan inte k\xF6ra filen:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Fel vid \xF6ppning av registernyckel:%n%1\%2
+ErrorRegCreateKey=Kan ej skapa registernyckel:%n%1\%2
+ErrorRegWriteKey=Kan ej skriva till registernyckel:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Kan inte skriva nytt INI-v\xE4rde i filen "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=V\xE4lj F\xF6rs\xF6k igen eller Ignorera f\xF6r att hoppa \xF6ver denna fil (ej rekommenderat), eller v\xE4lj Avbryt installationen.
+FileAbortRetryIgnore2=V\xE4lj F\xF6rs\xF6k igen eller Ignorera och forts\xE4tt \xE4nd\xE5 (ej rekommenderat), eller v\xE4lj Avbryt installationen.
+SourceIsCorrupted=K\xE4llfilen \xE4r felaktig
+SourceDoesntExist=K\xE4llfilen "%1" finns inte
+ExistingFileReadOnly=Den nuvarande filen \xE4r skrivskyddad.%n%nV\xE4lj F\xF6rs\xF6k igen f\xF6r att ta bort skrivskyddet, Ignorera f\xF6r att hoppa \xF6ver denna fil, eller v\xE4lj Avbryt installationen.
+ErrorReadingExistingDest=Ett fel uppstod vid f\xF6rs\xF6k att l\xE4sa den befintliga filen:
+FileExists=Filen finns redan.%n%nVill du skriva \xF6ver den?
+ExistingFileNewer=Den befintliga filen \xE4r nyare \xE4n den som ska installeras. Du rekommenderas att beh\xE5lla den befintliga filen. %n%nVill Du beh\xE5lla den befintliga filen?
+ErrorChangingAttr=Ett fel uppstod vid f\xF6rs\xF6k att \xE4ndra attribut p\xE5 den befintliga filen:
+ErrorCreatingTemp=Ett fel uppstod vid ett f\xF6rs\xF6k att skapa installationskatalogen:
+ErrorReadingSource=Ett fel uppstod vid ett f\xF6rs\xF6k att l\xE4sa k\xE4llfilen:
+ErrorCopying=Ett fel uppstod vid kopiering av filen:
+ErrorReplacingExistingFile=Ett fel uppstod vid ett f\xF6rs\xF6k att ers\xE4tta den befintliga filen:
+ErrorRestartReplace=\xC5terstartaErs\xE4tt misslyckades:
+ErrorRenamingTemp=Ett fel uppstod vid ett f\xF6rs\xF6k att byta namn p\xE5 en fil i installationskatalogen:
+ErrorRegisterServer=Kunde inte registrera DLL/OCX: %1
+ErrorRegSvr32Failed=RegSvr32 misslyckades med felkod %1
+ErrorRegisterTypeLib=Kunde inte registrera typbibliotek: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=Ett fel uppstod vid \xF6ppnandet av L\xC4S MIG-filen.
+ErrorRestartingComputer=Installationsprogrammet kunde inte starta om datorn. Var god g\xF6r det manuellt.
+
+; *** Uninstaller messages
+UninstallNotFound=Filen "%1" finns inte. Kan inte avinstallera.
+UninstallOpenError=Filen "%1" kan inte \xF6ppnas. Kan inte avinstallera.
+UninstallUnsupportedVer=Avinstallationsloggen "%1" \xE4r i ett format som denna version inte k\xE4nner igen. Kan ej avinstallera
+UninstallUnknownEntry=En ok\xE4nd rad (%1) hittades i avinstallationsloggen
+ConfirmUninstall=\xC4r du s\xE4ker p\xE5 att du vill ta bort %1 och alla tillh\xF6rande komponenter?
+UninstallOnlyOnWin64=Denna installation kan endast avinstalleras p\xE5 en 64-bitarsversion av Windows.
+OnlyAdminCanUninstall=Denna installation kan endast avinstalleras av en anv\xE4ndare med administrativa r\xE4ttigheter.
+UninstallStatusLabel=Var god och v\xE4nta medan %1 tas bort fr\xE5n din dator.
+UninstalledAll=%1 \xE4r nu borttaget fr\xE5n din dator.
+UninstalledMost=Avinstallationen av %1 \xE4r nu klar.%n%nEn del filer/kataloger gick ej att ta bort. Dessa kan tas bort manuellt.
+UninstalledAndNeedsRestart=F\xF6r att slutf\xF6ra avinstallationen av %1 m\xE5ste datorn startas om.%n%nVill du starta om nu?
+UninstallDataCorrupted=Filen "%1" \xE4r felaktig. Kan inte avinstallera
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Ta bort delad fil?
+ConfirmDeleteSharedFile2=Systemet indikerar att f\xF6ljande delade fil inte l\xE4ngre anv\xE4nds av n\xE5gra program. Vill du ta bort den delade filen?%n%n%1%n%nOm n\xE5got program fortfarande anv\xE4nder denna fil och den raderas, kommer programmet kanske att sluta fungera. Om du \xE4r os\xE4ker, v\xE4lj Nej. Att l\xE5ta filen ligga kvar i systemet kommer inte att orsaka n\xE5gon skada.
+SharedFileNameLabel=Filnamn:
+SharedFileLocationLabel=Plats:
+WizardUninstalling=Avinstallationsstatus
+StatusUninstalling=Avinstallerar %1...
+[CustomMessages]
+NameAndVersion=%1 version %2
+AdditionalIcons=\xC5terst\xE5ende ikoner:
+CreateDesktopIcon=Skapa en ikon p\xE5 skrivbordet
+CreateQuickLaunchIcon=Skapa en ikon i Snabbstartf\xE4ltet
+ProgramOnTheWeb=%1 p\xE5 Webben
+UninstallProgram=Avinstallera %1
+LaunchProgram=Starta %1
+AssocFileExtension=Associera %1 med %2 filnamnstill\xE4gg
+AssocingFileExtension=Associerar %1 med %2 filnamnstill\xE4gg...
\ No newline at end of file
Deleted: trunk/MythTVReader/InnoSetup/Swedish-8-4.2.1.isl
===================================================================
--- trunk/MythTVReader/InnoSetup/Swedish-8-4.2.1.isl 2008-06-29 14:07:31 UTC (rev 557)
+++ trunk/MythTVReader/InnoSetup/Swedish-8-4.2.1.isl 2008-06-29 15:29:09 UTC (rev 558)
@@ -1,305 +0,0 @@
-[LangOptions]
-
-; *** Inno Setup version 4.2.1+ Swedish messages ***
-;
-; Translated by st...@bo...
-; -------+---------+---------+---------+---------+---------+---------+---------
-; Translators notes (for Swedes only :)
-;
-; Rev 040128: 4.1.2 av st...@bo...
-; Rev 030501: 4.0.0 av st...@bo...
-; Rev 020903: 3.0.3 av sor...@fr...
-; Rev 020602: 3.0.2 av pe...@pe...
-; Rev 010508: 2.0.8 av pet...@te...
-; Rev 001019: 1.3.21 av pet...@te...
-; Rev 000428: 1.3x
-; Rev 991028: Sm\xE4rre \xE4ndringar.
-; Rev 990927: Nytt
-LanguageName=Svenska
-LanguageID=$041D
-LanguageCodePage=0
-[Messages]
-
-; *** Application titles
-SetupAppTitle=Installationsprogram
-SetupWindowTitle=Installationsprogram f\xF6r %1
-UninstallAppTitle=Avinstallation
-UninstallAppFullTitle=%1 Avinstallation
-
-; *** Misc. common
-InformationTitle=Information
-ConfirmTitle=Bekr\xE4fta
-ErrorTitle=Fel
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=%1 kommer att installeras. Vill du forts\xE4tta?
-LdrCannotCreateTemp=Kan ej skapa en tempor\xE4r fil. Installationen avbryts
-LdrCannotExecTemp=Kan inte k\xF6ra fil i tempor\xE4r mapp. Installationen avbryts
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%nFel %2: %3
-SetupFileMissing=Filen %1 saknas i installationsmappen. R\xE4tta till problemet eller h\xE4mta en ny kopia av programmet.
-SetupFileCorrupt=Installationsfilerna \xE4r felaktiga. H\xE4mta en ny kopia av programmet
-SetupFileCorruptOrWrongVer=Installationsfilerna \xE4r felaktiga, eller st\xE4mmer ej \xF6verens med denna version av installationsprogrammet. R\xE4tta till felet eller h\xE4mta en ny programkopia.
-NotOnThisPlatform=Detta program kan ej k\xF6ras p\xE5 %1.
-OnlyOnThisPlatform=Detta program m\xE5ste ha %1.
-WinVersionTooLowError=Detta program kr\xE4ver %1, version %2 eller senare.
-WinVersionTooHighError=Programmet kan inte installeras p\xE5 %1 version %2 eller senare.
-AdminPrivilegesRequired=Du m\xE5ste vara inloggad som administrat\xF6r n\xE4r du installerar detta program.
-PowerUserPrivilegesRequired=Du m\xE5ste vara inloggad som administrat\xF6r eller medlem av gruppen Privilegierade anv\xE4ndare (Power Users) n\xE4r du installerar detta program.
-SetupAppRunningError=Installationsprogrammet har uppt\xE4ckt att %1 \xE4r ig\xE5ng.%n%nAvsluta det angivna programmet nu. Klicka sedan p\xE5 OK f\xF6r att g\xE5 vidare, eller p\xE5 Avbryt f\xF6r avslut.
-UninstallAppRunningError=Avinstalleraren har uppt\xE4ckt att %1 k\xF6rs f\xF6r tillf\xE4llet.%n%nSt\xE4ng all \xF6ppna instanser av det nu, klicka sedan p\xE5 OK f\xF6r att g\xE5 vidare, eller Avbryt f\xF6r att avsluta.
-
-; *** Misc. errors
-ErrorCreatingDir=Kunde inte skapa mappen "%1"
-ErrorTooManyFilesInDir=Kunde inte skapa en fil i mappen "%1" d\xE4rf\xF6r att den inneh\xE5ller f\xF6r m\xE5nga filer
-
-; *** Setup common messages
-ExitSetupTitle=Avsluta installationen
-ExitSetupMessage=Installationen \xE4r inte f\xE4rdig. Om du slutar nu, kommer programmet inte att installeras.%n%nDu kan k\xF6ra installationsprogrammet vid ett senare tillf\xE4lle f\xF6r att avsluta installationen.%n%nVill du avbryta installationen?
-AboutSetupMenuItem=&Om installationsprogrammet...
-AboutSetupTitle=Om installationsprogrammet
-AboutSetupMessage=%1 version %2%n%3%n%n%1 hemsida:%n%4
-AboutSetupNote=Svensk \xF6vers\xE4ttning \xE4r gjord av di...@go... 1999, 2002%n%nUppdatering till 3.0.2+ av pe...@pe..., 4.x.x av Stefan Bodingh
-
-; *** Buttons
-ButtonBack=< &Tillbaka
-ButtonNext=&N\xE4sta >
-ButtonInstall=&Installera
-ButtonOK=OK
-ButtonCancel=Avbryt
-ButtonYes=&Ja
-ButtonYesToAll=Ja till &Allt
-ButtonNo=&Nej
-ButtonNoToAll=N&ej till allt
-ButtonFinish=&Slutf\xF6r
-ButtonBrowse=&Bl\xE4ddra...
-ButtonWizardBrowse=&Bl\xE4ddra...
-ButtonNewFolder=Skapa ny mapp
-SelectLanguageTitle=V\xE4lj spr\xE5k f\xF6r installationen
-SelectLanguageLabel=V\xE4lj spr\xE5k som skall anv\xE4ndas under installationen:
-
-; *** Common wizard text
-ClickNext=Klicka p\xE5 N\xE4sta f\xF6r att forts\xE4tta, eller Avbryt f\xF6r att avsluta installationen.
-BeveledLabel=
-BrowseDialogTitle=Bl\xE4ddra mapp
-BrowseDialogLabel=V\xE4lj en mapp i listan nedan, klicka sedan OK.
-NewFolderName=Ny mapp
-
-; *** "Welcome" wizard page
-;WizardWelcome=V\xE4lkommen
-;WelcomeLabel1=V\xE4lkommen till installationsprogrammet f\xF6r [name].
-;WelcomeLabel2=Detta kommer att installera [name/ver] p\xE5 din dator.%n%nDet rekommenderas att du avslutar alla andra program innan du forts\xE4tter. Det f\xF6rebygger konflikter under installationens g\xE5ng.
-; *** "Password" wizard page
-WelcomeLabel1=V\xE4lkommen till installationen av [name]
-WelcomeLabel2=Installationsprogrammet kommer att installera [name/ver] p\xE5 din dator.
-WizardPassword=L\xF6senord
-PasswordLabel1=Denna installation \xE4r skyddad med l\xF6senord.
-PasswordLabel3=Var god ange l\xF6senordet, klicka sedan p\xE5 N\xE4sta f\xF6r att forts\xE4tta. L\xF6senord skiljer p\xE5 versaler/gemener.
-PasswordEditLabel=&L\xF6senord:
-IncorrectPassword=L\xF6senordet du angav \xE4r inkorrekt. F\xF6rs\xF6k igen.
-
-; *** "License Agreement" wizard page
-WizardLicense=Licensavtal
-LicenseLabel=Var god och l\xE4s f\xF6ljande viktiga information innan du forts\xE4tter.
-LicenseLabel3=Var god och l\xE4s f\xF6ljande licensavtal. Du m\xE5ste acceptera villkoren i avtalet innan du kan forts\xE4tta med installationen.
-LicenseAccepted=Jag &accepterar avtalet
-LicenseNotAccepted=Jag accepterar &inte avtalet
-
-; *** "Information" wizard pages
-WizardInfoBefore=Information
-InfoBeforeLabel=Var god l\xE4s f\xF6ljande viktiga information innan du forts\xE4tter.
-InfoBeforeClickLabel=N\xE4r du \xE4r klar att forts\xE4tta med installationen, klicka p\xE5 N\xE4sta.
-WizardInfoAfter=Information
-InfoAfterLabel=Var god l\xE4s f\xF6ljande viktiga information innan du forts\xE4tter.
-InfoAfterClickLabel=N\xE4r du \xE4r klar att forts\xE4tta med installationen, klicka p\xE5 N\xE4sta.
-
-; *** "User Information" wizard page
-WizardUserInfo=Anv\xE4ndarinformation
-UserInfoDesc=Var god och fyll i f\xF6ljande uppgifter.
-UserInfoName=&Namn:
-UserInfoOrg=&Organisation:
-UserInfoSerial=&Serienummer:
-UserInfoNameRequired=Du m\xE5ste fylla i ett namn.
-
-; *** "Select Destination Directory" wizard page
-WizardSelectDir=V\xE4lj installationsplats
-SelectDirDesc=Var skall [name] installeras?
-SelectDirLabel3=Installationsprogrammet kommer att installera [name] i f\xF6ljande mapp
-SelectDirBrowseLabel=F\xF6r att forts\xE4tta, klicka p\xE5 N\xE4sta. Om du vill v\xE4lja en annan mapp, klicka p\xE5 Bl\xE4ddra.
-DiskSpaceMBLabel=Programmet kr\xE4ver minst [mb] MB h\xE5rddiskutrymme.
-ToUNCPathname=Installationsprogrammet kan inte installera till UNC s\xF6kv\xE4g. Om du f\xF6rs\xF6ker installera via ett n\xE4tverk, ska du ange n\xE4tverksenheten.
-InvalidPath=Du m\xE5ste skriva en fullst\xE4ndig s\xF6kv\xE4g med enhetsbeteckning; till exempel:%C:\APP
-InvalidDrive=Enheten du har valt finns inte eller \xE4r inte tillg\xE4nglig. V\xE4lj en annan.
-DiskSpaceWarningTitle=Ej tillr\xE4ckligt med diskutrymme
-DiskSpaceWarning=Installationsprogrammet beh\xF6ver \xE5tminstone %1 KB ledigt diskutrymme f\xF6r installationen, men den valda enheten har bara %2 KB tillg\xE4ngligt.%n%nVill du forts\xE4tta \xE4nd\xE5?
-DirNameTooLong=Mappens namn eller s\xF6kv\xE4g \xE4r f\xF6r l\xE5ng.
-InvalidDirName=Mappen du har valt \xE4r inte tillg\xE4nglig.
-BadDirName32=Mappens namn f\xE5r ej inneh\xE5lla n\xE5got av f\xF6ljande tecken:%n%n%1
-DirExistsTitle=Mappen finns
-DirExists=Mappen:%n%n%1%n%nfinns redan. Vill du \xE4nd\xE5 forts\xE4tta installationen till den valda mappen?
-DirDoesntExistTitle=Mappen finns inte
-DirDoesntExist=Mappen:%n%n%1%n%nfinns inte. Vill du skapa den?
-
-; *** "Select Components" wizard page
-WizardSelectComponents=V\xE4lj komponenter
-SelectComponentsDesc=Vilka komonenter skall installeras?
-SelectComponentsLabel2=V\xE4lj de komponenter som du vill ska installeras; avmarkera de komponenter som du inte vill ha. Klicka p\xE5 N\xE4sta n\xE4r du \xE4r klar att forts\xE4tta.
-FullInstallation=Fullst\xE4ndig installation
-
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=Kompakt installation
-CustomInstallation=Anpassad installation
-NoUninstallWarningTitle=Komponenter finns
-NoUninstallWarning=Installationsprogrammet har uppt\xE4ckt att f\xF6ljande komponenter redan finns installerade p\xE5 din dator:%n%n%1%n%nAtt avmarkera dessa komponenter kommer inte att avinstallera dom.%n%nVill du forts\xE4tta i alla fall?
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=Aktuella val kr\xE4ver minst [mb] MB diskutrymme.
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=V\xE4lj extra uppgifter
-SelectTasksDesc=Vilka extra uppgifter skall utf\xF6ras?
-SelectTasksLabel2=Markera ytterligare uppgifter att utf\xF6ra vid installation av [name], tryck sedan p\xE5 N\xE4sta.
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=V\xE4lj Startmeny-mapp
-SelectStartMenuFolderDesc=Var skall installationsprogrammet placera programmets genv\xE4gar?
-SelectStartMenuFolderLabel3=Installationsprogrammet kommer att skapa programmets genv\xE4gar i f\xF6ljande mapp.
-SelectStartMenuFolderBrowseLabel=F\xF6r att forts\xE4tta, klicka p\xE5 N\xE4sta. Om du vill v\xE4lja en annan mapp, klicka p\xE5 Bl\xE4ddra.
-NoIconsCheck=&Skapa inte ikoner
-MustEnterGroupName=Du m\xE5ste ange en mapp.
-GroupNameTooLong=Mappens namn eller s\xF6kv\xE4g \xE4r f\xF6r l\xE5ng.
-InvalidGroupName=Mappen du har valt \xE4r inte tillg\xE4nglig.
-BadGroupName=Mappnamnet kan inte inneh\xE5lla n\xE5gon av f\xF6ljande tecken:%n%n%1
-NoProgramGroupCheck2=&Skapa ingen Startmeny-mapp
-
-; *** "Ready to Install" wizard page
-WizardReady=Redo att installera
-ReadyLabel1=Installationsprogrammet \xE4r nu redo att installera [name] p\xE5 din dator.
-ReadyLabel2a=Tryck p\xE5 Installera om du vill forts\xE4tta, eller g\xE5 Tillbaka om du vill se \xF6ver eller \xE4ndra p\xE5 n\xE5got.
-ReadyLabel2b=V\xE4lj Installera f\xF6r att p\xE5b\xF6rja installationen.
-ReadyMemoUserInfo=Anv\xE4ndarinformation:
-ReadyMemoDir=Installationsplats:
-ReadyMemoType=Installationstyp:
-ReadyMemoComponents=Valda komponenter:
-ReadyMemoGroup=Startmeny-mapp:
-ReadyMemoTasks=Extra uppgifter:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=F\xF6rbereder installationen
-PreparingDesc=Installationsprogrammet f\xF6rbereder installationen av [name] p\xE5 din dator.
-PreviousInstallNotCompleted=Installationen/avinstallationen av ett tidigare program har inte slutf\xF6rts. Du m\xE5ste starta om datorn f\xF6r att avsluta den installationen.%n%nEfter att ha startat om datorn k\xF6r du installationsprogrammet igen f\xF6r att slutf\xF6ra installationen av [name].
-CannotContinue=Installationsprogrammet kan inte forts\xE4tta. Klicka p\xE5 Avbryt f\xF6r att avsluta.
-
-; *** "Installing" wizard page
-WizardInstalling=Installerar
-InstallingLabel=V\xE4nta medan [name] installeras p\xE5 din dator.
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=Avslutar installationen av [name]
-FinishedLabelNoIcons=[name] har nu installerats p\xE5 din dator.
-FinishedLabel=[name] har nu installerats p\xE5 din dator. Programmet kan startas genom att v\xE4lja n\xE5gon av ikonerna.
-ClickFinish=V\xE4lj Slutf\xF6r f\xF6r att avsluta installationen.
-FinishedRestartLabel=F\xF6r att slutf\xF6ra installationen av [name], m\xE5ste datorn startas om. Vill du starta om nu?
-FinishedRestartMessage=F\xF6r att slutf\xF6ra installationen av [name], m\xE5ste datorn startas om.%n%nVill du starta om datorn nu?
-ShowReadmeCheck=Ja, jag vill se filen L\xC4S MIG
-YesRadio=&Ja, jag vill starta om datorn nu
-NoRadio=&Nej, jag startar sj\xE4lv om datorn senare
-
-; used for example as 'Run MyProg.exe'
-RunEntryExec=K\xF6r %1
-
-; used for example as 'View Readme.txt'
-RunEntryShellExec=L\xE4s %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=Installationsprogrammet beh\xF6ver n\xE4sta diskett
-SelectDiskLabel2=Var god s\xE4tt i diskett %1 och tryck OK.%n%nOm filerna kan hittas i en annan mapp \xE4n den som visas nedan, skriv in r\xE4tt s\xF6kv\xE4g eller v\xE4lj Bl\xE4ddra.
-PathLabel=&S\xF6kv\xE4g:
-FileNotInDir2=Kunde inte hitta filen "%1" i "%2". Var god s\xE4tt i korrekt diskett eller v\xE4lj en annan mapp.
-SelectDirectoryLabel=Var god ange s\xF6kv\xE4gen f\xF6r n\xE4sta diskett.
-
-; *** Installation phase messages
-SetupAborted=Installationen slutf\xF6rdes inte.%n%nVar god r\xE4tta till felet och k\xF6r installationen igen.
-EntryAbortRetryIgnore=V\xE4lj F\xF6rs\xF6k igen eller Ignorera f\xF6r att forts\xE4tta i alla fall, Avbryt f\xF6r att avbryta installationen.
-
-; *** Installation status messages
-StatusCreateDirs=Skapar mappar...
-StatusExtractFiles=Packar upp filer...
-StatusCreateIcons=Skapar programikoner...
-StatusCreateIniEntries=Skriver INI-v\xE4rden...
-StatusCreateRegistryEntries=Skriver register-v\xE4rden...
-StatusRegisterFiles=Registrerar filer...
-StatusSavingUninstall=Sparar information f\xF6r avinstallation...
-StatusRunProgram=Slutf\xF6r installationen...
-StatusRollback=\xC5terst\xE4ller \xE4ndringar...
-
-; *** Misc. errors
-ErrorInternal2=Internt fel: %1
-ErrorFunctionFailedNoCode=%1 misslyckades
-ErrorFunctionFailed=%1 misslyckades; kod %2
-ErrorFunctionFailedWithMessage=%1 misslyckades; kod %2.%n%3
-ErrorExecutingProgram=Kan inte k\xF6ra filen:%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=Fel vid \xF6ppning av registernyckel:%n%1\%2
-ErrorRegCreateKey=Kan ej skapa registernyckel:%n%1\%2
-ErrorRegWriteKey=Kan ej skriva till registernyckel:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=Kan inte skriva nytt INI-v\xE4rde i filen "%1".
-
-; *** File copying errors
-FileAbortRetryIgnore=V\xE4lj F\xF6rs\xF6k igen eller Ignorera f\xF6r hoppa \xF6ver denna fil (ej rekommenderat), eller Avbryt installationen.
-FileAbortRetryIgnore2=V\xE4lj F\xF6rs\xF6k igen eller Ignorera och forts\xE4tt i alla fall (ej rekommenderat), eller Avbryt installationen.
-SourceIsCorrupted=K\xE4llfilen \xE4r felaktig
-SourceDoesntExist=K\xE4llfilen "%1" finns inte
-ExistingFileReadOnly=Den nuvarande filen \xE4r skrivskyddad.%n%nV\xE4lj F\xF6rs\xF6k igen f\xF6r att ta bort skrivskyddet, Ignorera f\xF6r att hoppa \xF6ver denna fil, eller Avbryt installationen.
-ErrorReadingExistingDest=Ett fel uppstod vid f\xF6rs\xF6k att l\xE4sa den befintliga filen:
-FileExists=Filen finns redan.%n%nVill du skriva \xF6ver den?
-ExistingFileNewer=Den befintliga filen \xE4r nyare \xE4n den som ska installeras. Du rekommenderas att beh\xE5lla den befintliga filen. %n%nVill Du beh\xE5lla den befintliga filen?
-ErrorChangingAttr=Ett fel uppstod vid f\xF6rs\xF6k att \xE4ndra attribut p\xE5 den befintliga filen:
-ErrorCreatingTemp=Ett fel uppstod vid ett f\xF6rs\xF6k att skapa installationsmappen:
-ErrorReadingSource=Ett fel uppstod vid ett f\xF6rs\xF6k att l\xE4sa k\xE4llfilen:
-ErrorCopying=Ett fel uppstod vid kopiering av filen:
-ErrorReplacingExistingFile=Ett fel uppstod vid ett f\xF6rs\xF6k att ers\xE4tta den befintliga filen:
-ErrorRestartReplace=RestartReplace misslyckades:
-ErrorRenamingTemp=Ett fel uppstod vid ett f\xF6rs\xF6k att byta namn p\xE5 en fil i installationsmappen:
-ErrorRegisterServer=Kunde inte registrera DLL/OCX: %1
-ErrorRegisterServerMissingExport=DllRegisterServer export kunde inte hittas
-ErrorRegisterTypeLib=Kunde inte registrera typbibliotek: %1
-
-; *** Post-installation errors
-ErrorOpeningReadme=Ett fel uppstod vid \xF6ppnandet av L\xC4S MIG-filen.
-ErrorRestartingComputer=Installationsprogrammet kunde inte starta om datorn. Var god g\xF6r det manuellt.
-
-; *** Uninstaller messages
-UninstallNotFound=Filen "%1" finns inte. Kan inte avinstallera.
-UninstallOpenError=Filen "%1" kan inte \xF6ppnas. Kan inte avinstallera.
-UninstallUnsupportedVer=Avinstallationsloggen "%1" \xE4r i ett format som denna version inte k\xE4nner igen. Kan ej avinstallera
-UninstallUnknownEntry=En ok\xE4nd rad (%1) hittades i avinstallationsloggen
-ConfirmUninstall=\xC4r du s\xE4ker p\xE5 att du vill ta bort %1 och alla tillh\xF6rande komponenter?
-OnlyAdminCanUninstall=Denna installation kan endast avinstalleras av en anv\xE4ndare med administrativa r\xE4ttigheter.
-UninstallStatusLabel=Var god och v\xE4nta medan %1 tas bort fr\xE5n din dator.
-UninstalledAll=%1 \xE4r nu borttaget fr\xE5n din dator.
-UninstalledMost=Avinstallationen av %1 \xE4r nu klar.%n%nEn del filer/mappar gick ej att ta bort. Dessa kan tas bort manuellt.
-UninstalledAndNeedsRestart=F\xF6r att slutf\xF6ra avinstallationen av %1 m\xE5ste datorn startas om.%n%nVill du starta om nu?
-UninstallDataCorrupted=Filen "%1" \xE4r felaktig. Kan inte avinstallara
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=Ta bort delad fil?
-ConfirmDeleteSharedFile2=Systemet indikerar att f\xF6ljande delade fil inte l\xE4ngre anv\xE4nds av n\xE5gra program. Vill du ta bort den delade filen?%n%n%1%n%nOm n\xE5got program fortfarande anv\xE4nder denna fil och den raderas, kommer programmet kanske att sluta fungera. Om du \xE4r os\xE4ker, v\xE4lj Nej. Att l\xE5ta filen ligga kvar i systemet kommer inte att orsaka n\xE5gon skada.
-SharedFileNameLabel=Filnamn:
-SharedFileLocationLabel=Plats:
-WizardUninstalling=Avinstallationsstatus
-StatusUninstalling=Avinstallerar %1...
-[CustomMessages]
-NameAndVersion=%1 version %2
-AdditionalIcons=\xC5terst\xE5ende ikoner:
-CreateDesktopIcon=Skapa en ikon p\xE5 srivbordet
-CreateQuickLaunchIcon=Skapa en ikon i Snabbstartf\xE4ltet
-ProgramOnTheWeb=%1 p\xE5 Webben
-UninstallProgram=Avinstallera %1
-LaunchProgram=Starta %1
-AssocFileExtension=&Associera %1 med %2 filnamnstill\xE4gg
-AssocingFileExtension=Associerar %1 med %2 filnamnstill\xE4gg...
Modified: trunk/MythTVReader/InnoSetup/setup.iss
===================================================================
--- trunk/MythTVReader/InnoSetup/setup.iss 2008-06-29 14:07:31 UTC (rev 557)
+++ trunk/MythTVReader/InnoSetup/setup.iss 2008-06-29 15:29:09 UTC (rev 558)
@@ -23,7 +23,7 @@
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "sv"; MessagesFile: "Swedish-8-4.2.1.isl"
+Name: "sv"; MessagesFile: "Swedish-10-5.1.12.isl"
[Components]
Name: "main"; Description: "Main Files"; Types: full compact custom; Flags: fixed
@@ -63,7 +63,7 @@
[Registry]
Root: HKCR; Subkey: ".nuv"; ValueType: string; ValueName: ""; ValueData: "nuvfile"; Flags: uninsdeletekeyifempty
-; The following two lines makes thumbnail preview work in windows explorer.
+; The following lines makes thumbnail preview work in windows explorer.
; we are reusing windows own video thumbnail extractor
Root: HKCR; Subkey: ".nuv\ShellEx"; Flags: uninsdeletekeyifempty;
Root: HKCR; Subkey: ".nuv\ShellEx\{{BB2E617C-0920-11d1-9A0B-00C04FC2D6C1}"; Flags: uninsdeletekey;
@@ -81,28 +81,41 @@
Root: HKCR; Subkey: "nuvfile\shell\convert\command"; Flags: createvalueifdoesntexist; ValueType: string; ValueName: ""; ValueData: "{app}\NuvConv.exe /s ""%1""";
;registry keys for shell extensions
-Root: HKCR; Subkey: "nuvfile\shellex"; Flags: uninsdeletekeyifempty; OnlyBelowVersion: 6.0,6.0; Components: shell;
+Root: HKCR; Subkey: "nuvfile\shellex"; Flags: uninsdeletekeyifempty; Components: shell;
Root: HKCR; Subkey: "nuvfile\shellex\PropertySheetHandlers"; Flags: uninsdeletekeyifempty; OnlyBelowVersion: 6.0,6.0; Components: shell;
-Root: HKCR; Subkey: "mpegfile\shellex\PropertySheetHandlers"; Flags: uninsdeletekeyifempty; OnlyBelowVersion: 6.0,6.0; Components: shell;
-;file propertypage
+Root: HKCR; Subkey: "{reg:HKCR\.mpg,|mpegfile}\shellex\PropertySheetHandlers"; Flags: uninsdeletekeyifempty; OnlyBelowVersion: 6.0,6.0; Components: shell;
+
+;file propertypage (XP)
Root: HKCR; Subkey: "nuvfile\shellex\PropertySheetHandlers\Page1"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{825D30CF-C997-420A-96CD-24EEA350F03C}"; OnlyBelowVersion: 6.0,6.0; Components: shell;
;no need for the fileinfo propertypage on mpg files, it's not going to work anyway.
;Root: HKCR; Subkey: "mpegfile\shellex\PropertySheetHandlers\Page1"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{825D30CF-C997-420A-96CD-24EEA350F03C}"; OnlyBelowVersion: 6.0,6.0; Components: shell;
-;db propertypage
+
+;db propertypage (XP)
Root: HKCR; Subkey: "nuvfile\shellex\PropertySheetHandlers\Page2"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{E6118413-72FC-4FAD-9953-5BE30CFCE358}"; OnlyBelowVersion: 6.0,6.0; Components: shell;
-Root: HKCR; Subkey: "mpegfile\shellex\PropertySheetHandlers\Page2"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{E6118413-72FC-4FAD-9953-5BE30CFCE358}"; OnlyBelowVersion: 6.0,6.0; Components: shell;
-;tooltip shell extension
+Root: HKCR; Subkey: "{reg:HKCR\.mpg,|mpegfile}\shellex\PropertySheetHandlers\Page2"; Flags: uninsdeletekeyifempty; ValueType: string; ValueName: ""; ValueData: "{{E6118413-72FC-4FAD-9953-5BE30CFCE358}"; OnlyBelowVersion: 6.0,6.0; Components: shell;
+
+;tooltip shell extension (XP+Vista)
+;shouldn't be needed for vista but something doesnt work InfoTip reg key for the vista property handler
Root: HKCR; Subkey: "nuvfile\shellex\{{00021500-0000-0000-C000-000000000046}"; Flags: uninsdeletekeyifempty; Components: shell;
Root: HKCR; SubKey: "nuvfile\shellex\{{00021500-0000-0000-C000-000000000046}"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{0A9A5748-13FB-4F77-8321-3536D94AB86E}"; Components: shell;
Root: HKCR; Subkey: ".mpg\shellex\{{00021500-0000-0000-C000-000000000046}"; Flags: uninsdeletekeyifempty; Components: shell;
Root: HKCR; SubKey: ".mpg\shellex\{{00021500-0000-0000-C000-000000000046}"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{0A9A5748-13FB-4F77-8321-3536D94AB86E}"; Components: shell;
;registry entries for vista property handler
-Root: HKCR; SubKey: "nuvfile"; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "ExtendedTileInfo"; ValueData: "prop:System.Title;System.Media.SubTitle;System.RecordedTV.RecordingTime;System.RecordedTV.StationName;System.RecordedTV.ProgramDescription";
-Root: HKCR; SubKey: "nuvfile"; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "FullDetails"; ValueData: "prop:System.PropGroup.Description;System.Title;System.Media.SubTitle;System.Rating;System.Keywords;System.PropGroup.Media;System.Media.Year;System.Media.Duration;System.PropGroup.RecordedTV;System.RecordedTV.RecordingTime;System.RecordedTV.StationCallSign;System.RecordedTV.StationName;System.RecordedTV.ProgramDescription;System.RecordedTV.Credits;System.RecordedTV.IsRepeatBroadcast;System.RecordedTV.IsHDContent;System.RecordedTV.IsClosedCaptioningAvailable;System.PropGroup.Audio;System.Audio.ChannelCount;System.Audio.EncodingBitrate;System.Audio.SampleRate;System.PropGroup.Video;System.Video.FrameWidth;System.Video.FrameHeight;System.Video.FrameRate;System.Video.EncodingBitrate;System.PropGroup.Origin;System.Video.Director;System.Media.Producer;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.DateCreated;System.DateModified;System.Size;System.FileAttributes;System.OfflineAvailability;System.OfflineStatus;System.SharedWith;System.FileOwner;System.ComputerName";
-Root: HKCR; SubKey: "nuvfile"; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "InfoTip"; ValueData: "prop:System.Title;System.Media.SubTitle;System.RecordedTV.RecordingTime;System.RecordedTV.StationName;System.RecordedTV.ProgramDescription";
-Root: HKCR; SubKey: "nuvfile"; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "PreviewDetails"; ValueData: "prop:System.Title;System.Media.SubTitle;System.RecordedTV.StationName;System.Media.Duration;*System.RecordedTV.ProgramDescription";
-Root: HKCR; SubKey: "nuvfile"; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "PreviewTitle"; ValueData: "prop:System.Title;System.ItemType";
+;nuv files
+Root: HKCR; SubKey: "nuvfile"; Flags: uninsdeletevalue; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "ExtendedTileInfo"; ValueData: "prop:System.Title;System.Media.SubTitle;System.RecordedTV.RecordingTime;System.RecordedTV.StationName;System.RecordedTV.ProgramDescription";
+Root: HKCR; SubKey: "nuvfile"; Flags: uninsdeletevalue; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "FullDetails"; ValueData: "prop:System.PropGroup.Description;System.Title;System.Media.SubTitle;System.Rating;System.Keywords;System.PropGroup.Media;System.Media.Year;System.Media.Duration;System.PropGroup.RecordedTV;System.RecordedTV.RecordingTime;System.RecordedTV.StationCallSign;System.RecordedTV.StationName;System.RecordedTV.ProgramDescription;System.RecordedTV.Credits;System.RecordedTV.IsRepeatBroadcast;System.RecordedTV.IsHDContent;System.RecordedTV.IsClosedCaptioningAvailable;System.PropGroup.Audio;System.Audio.ChannelCount;System.Audio.EncodingBitrate;System.Audio.SampleRate;System.PropGroup.Video;System.Video.FrameWidth;System.Video.FrameHeight;System.Video.FrameRate;System.Video.EncodingBitrate;System.PropGroup.Origin;System.Video.Director;System.Media.Producer;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.DateCreated;System.DateModified;System.Size;System.FileAttributes;System.OfflineAvailability;System.OfflineStatus;System.SharedWith;System.FileOwner;System.ComputerName";
+Root: HKCR; SubKey: "nuvfile"; Flags: uninsdeletevalue; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "InfoTip"; ValueData: "prop:System.Title;System.Media.SubTitle;System.RecordedTV.RecordingTime;System.RecordedTV.StationName;System.RecordedTV.ProgramDescription";
+Root: HKCR; SubKey: "nuvfile"; Flags: uninsdeletevalue; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "PreviewDetails"; ValueData: "prop:*System.Media.SubTitle;*System.RecordedTV.StationName;*System.Media.Duration;System.Size;*System.RecordedTV.ProgramDescription";
+Root: HKCR; SubKey: "nuvfile"; Flags: uninsdeletevalue; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "PreviewTitle"; ValueData: "prop:System.Title;System.ItemType";
+;mpg files
+;this will add extra properties to all mpg files including files unrelated to MythTV but for non MythTV files it wont work.
+Root: HKCR; SubKey: "{reg:HKCR\.mpg,|mpegfile}"; Flags: uninsdeletevalue; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "ExtendedTileInfo"; ValueData: "prop:System.Title;System.Media.SubTitle;System.RecordedTV.RecordingTime;System.RecordedTV.StationName;System.RecordedTV.ProgramDescription";
+Root: HKCR; SubKey: "{reg:HKCR\.mpg,|mpegfile}"; Flags: uninsdeletevalue; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "FullDetails"; ValueData: "prop:System.PropGroup.Description;System.Title;System.Media.SubTitle;System.Rating;System.Keywords;System.PropGroup.Media;System.Media.Year;System.Media.Duration;System.PropGroup.RecordedTV;System.RecordedTV.RecordingTime;System.RecordedTV.StationCallSign;System.RecordedTV.StationName;System.RecordedTV.ProgramDescription;System.RecordedTV.Credits;System.RecordedTV.IsRepeatBroadcast;System.RecordedTV.IsHDContent;System.RecordedTV.IsClosedCaptioningAvailable;System.PropGroup.Origin;System.Video.Director;System.Media.Producer;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.DateCreated;System.DateModified;System.Size;System.FileAttributes;System.OfflineAvailability;System.OfflineStatus;System.SharedWith;System.FileOwner;System.ComputerName";
+Root: HKCR; SubKey: "{reg:HKCR\.mpg,|mpegfile}"; Flags: uninsdeletevalue; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "InfoTip"; ValueData: "prop:System.Title;System.Media.SubTitle;System.RecordedTV.RecordingTime;System.RecordedTV.StationName;System.RecordedTV.ProgramDescription";
+Root: HKCR; SubKey: "{reg:HKCR\.mpg,|mpegfile}"; Flags: uninsdeletevalue; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "PreviewDetails"; ValueData: "prop:*System.Media.SubTitle;*System.RecordedTV.StationName;*System.Media.Duration;System.Size;*System.RecordedTV.ProgramDescription";
+Root: HKCR; SubKey: "{reg:HKCR\.mpg,|mpegfile}"; Flags: uninsdeletevalue; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "PreviewTitle"; ValueData: "prop:System.Title;System.ItemType";
+Root: HKLM; SubKey: "Software\Microsoft\Windows\CurrentVersion\Explorer\KindMap"; Flags: uninsdeletevalue; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: ".nuv"; ValueData: "recordedtv;video"
;default config settings
Root: HKLM; Subkey: "SOFTWARE\DSMyth"; Flags: uninsdeletekey;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-06-29 14:07:33
|
Revision: 557
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=557&view=rev
Author: tobbej
Date: 2008-06-29 07:07:31 -0700 (Sun, 29 Jun 2008)
Log Message:
-----------
don't fail if file seek table is broken or missing.
Modified Paths:
--------------
trunk/MythTVReader/DSMyth/NuvReader.cpp
Modified: trunk/MythTVReader/DSMyth/NuvReader.cpp
===================================================================
--- trunk/MythTVReader/DSMyth/NuvReader.cpp 2008-06-29 14:05:47 UTC (rev 556)
+++ trunk/MythTVReader/DSMyth/NuvReader.cpp 2008-06-29 14:07:31 UTC (rev 557)
@@ -178,10 +178,8 @@
if(!m_SeekTable.ReadFileSeekTable(SeekTablePos,KFATablePos))
{
m_SeekTable.DeInit();
- //should probably not fail here since we can probably
- //workaround a broken seek table with the seek table thread
- //or getting it from the backend
- return VFW_E_INVALID_FILE_FORMAT;
+ //seek table is missing, but this is not fatal.
+ //will be worked around below.
}
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-06-29 14:05:50
|
Revision: 556
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=556&view=rev
Author: tobbej
Date: 2008-06-29 07:05:47 -0700 (Sun, 29 Jun 2008)
Log Message:
-----------
small typo that prevented nuv files from being loaded
Modified Paths:
--------------
trunk/MythTVReader/common/AsyncReader.cpp
Modified: trunk/MythTVReader/common/AsyncReader.cpp
===================================================================
--- trunk/MythTVReader/common/AsyncReader.cpp 2007-08-05 11:28:58 UTC (rev 555)
+++ trunk/MythTVReader/common/AsyncReader.cpp 2008-06-29 14:05:47 UTC (rev 556)
@@ -50,7 +50,7 @@
return E_FAIL;
}
- HRESULT hr=m_pReader->SyncRead(m_pos,dwBytesRead,(BYTE*)pBuffer);
+ HRESULT hr=m_pReader->SyncRead(m_pos,dwBytesToRead,(BYTE*)pBuffer);
if(hr==S_OK)
{
dwBytesRead=dwBytesToRead;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-08-05 11:29:00
|
Revision: 555
http://dsmyth.svn.sourceforge.net/dsmyth/?rev=555&view=rev
Author: tobbej
Date: 2007-08-05 04:28:58 -0700 (Sun, 05 Aug 2007)
Log Message:
-----------
remove cvs log comments and update installer for the vista shell extensions
Modified Paths:
--------------
trunk/MythTVReader/InnoSetup/setup.iss
Modified: trunk/MythTVReader/InnoSetup/setup.iss
===================================================================
--- trunk/MythTVReader/InnoSetup/setup.iss 2007-07-21 12:44:24 UTC (rev 554)
+++ trunk/MythTVReader/InnoSetup/setup.iss 2007-08-05 11:28:58 UTC (rev 555)
@@ -1,122 +1,4 @@
; $Id$
-;
-; CVS Log
-; $Log$
-; Revision 1.35 2006/03/26 17:14:30 tobbej
-; install the right version of atl80.dll (ansi/unicode)
-; i missed the ansi version because it was well hidden in a windows installer merger module
-;
-; Revision 1.34 2006/01/15 18:46:29 tobbej
-; change to work with new Debug and Release dir.
-; add mysqlpp.dll and msvcp80.dll to installer.
-;
-; Revision 1.33 2005/11/27 14:18:30 tobbej
-; Update installer with new dll files.
-;
-; Revision 1.32 2005/11/05 18:16:38 tobbej
-; don't use the fileinfo propertypage on mpeg files, it's not going to work anyway
-;
-; Revision 1.31 2005/09/18 13:38:45 tobbej
-; Some fixes due to recent filename handling change in mythtv svn.
-;
-; Move shell extension registry setup from rgs files to installer and make installer add the extensions to mpg files too.
-; Some seektable related fixes for new filenames.
-; Allow column handler to work on mpg files.
-;
-; Revision 1.30 2005/07/17 07:58:28 tobbej
-; install urlsyntax text file too
-;
-; Revision 1.29 2005/06/25 16:33:06 tobbej
-; some updates to the installer, installer bitmaps, version
-;
-; Revision 1.28 2005/03/26 13:59:43 tobbej
-; new version
-;
-; Revision 1.27 2005/02/27 21:06:25 tobbej
-; some changes for the new conversion tool
-;
-; Revision 1.26 2005/02/11 19:31:35 tobbej
-; new version
-;
-; Revision 1.25 2004/09/11 14:50:07 tobbej
-; remove unnessesary projects and configurations
-;
-; Revision 1.24 2004/09/11 14:25:04 tobbej
-; updates for new release
-;
-; Revision 1.23 2004/07/24 15:35:52 tobbej
-; registry setting to enable tooltip on nuv files and explorer statusbar text
-;
-; Revision 1.22 2004/07/17 14:54:06 tobbej
-; don't overwrite some user settings if they already contain data.
-; changed default ringbuffer settings.
-; prepareing for new release.
-;
-; Revision 1.21 2004/05/29 17:20:41 tobbej
-; prepare for new release
-;
-; Revision 1.20 2004/05/15 16:12:30 tobbej
-; registry settings for new buffering code, forgot to change dll name when switching to new vstudio
-;
-; Revision 1.19 2004/04/28 19:01:49 tobbej
-; updated to vstudion .net 2003
-;
-; Revision 1.18 2004/04/11 09:56:08 tobbej
-; removed sv lang file since it's not updated for innosetup 4.2.1
-;
-; Revision 1.17 2004/04/11 09:49:04 tobbej
-; updated protocol version to 5
-;
-; Revision 1.16 2004/03/31 20:05:11 tobbej
-; updated version number
-;
-; Revision 1.15 2004/03/21 20:58:58 tobbej
-; updated lang files and fixed problem with double " around the program for urls
-;
-; Revision 1.14 2004/02/29 14:21:03 tobbej
-; no message
-;
-; Revision 1.13 2004/02/15 17:11:14 tobbej
-; updated setup for innosetup 4.1.5.
-; new lang file and better compression
-;
-; Revision 1.12 2004/01/02 16:58:31 tobbej
-; fixed some problems with the installation script (extra } at end of guid:s)
-;
-; Revision 1.11 2004/01/01 19:02:41 tobbej
-; added new configuration program to installer and changed some registry settings
-;
-; Revision 1.10 2003/12/08 20:42:00 tobbej
-; fixed libmysql.dll bug that caused it not to be installed.
-; removed PercivedType registry key since it causes problems with wmp.
-; added new source filter and registry entries for url protocolhandlers
-;
-; Revision 1.9 2003/11/02 12:49:18 tobbej
-; new release
-;
-; Revision 1.8 2003/10/11 17:22:47 tobbej
-; added changelog to setup
-;
-; Revision 1.7 2003/10/11 15:51:37 tobbej
-; fixed problem with ansi/unicode version of atl70.dll
-;
-; Revision 1.6 2003/10/07 17:31:39 tobbej
-; modified setup so it uninstalls all dlls properly
-;
-; Revision 1.5 2003/10/04 13:31:40 tobbej
-; moved readme file, new dll for mysql
-; updated setup script to include new dll:s
-; added innosetup translation file
-;
-; Revision 1.4 2003/08/31 18:11:06 tobbej
-; changed setup to install to own directory
-;
-; Revision 1.3 2003/08/24 11:19:49 tobbej
-; updated setup script for rtjpeg dmo
-;
-; Revision 1.2 2003/08/05 18:45:09 tobbej
-; updated and added comments
-;
[Setup]
AppName=MythTV Filters
@@ -171,9 +53,12 @@
Source: "lesser.txt"; DestDir: "{app}"; Components: main
Source: "..\Url syntax.txt"; DestDir: "{app}"; Components: main
-;experimental
-;Source: "..\NuvShExt\Release\NuvShExt.dll"; DestDir: "{app}"; Flags: regserver; Components: shell
-Source: "..\Release\NuvPropPage.dll"; DestDir: "{app}"; Flags: restartreplace regserver uninsrestartdelete replacesameversion; Components: shell
+;xp and below shell extensions
+Source: "..\Release\NuvPropPage.dll"; DestDir: "{app}"; Flags: restartreplace regserver uninsrestartdelete replacesameversion; OnlyBelowVersion: 6.0,6.0; Components: shell
+;vista only shell extensions
+Source: "..\Release\PropertyHandler.dll"; DestDir: "{app}"; Flags: restartreplace regserver uninsrestartdelete replacesameversion; MinVersion: 6.0,6.0; Components: shell
+;common tool tip shell extension
+Source: "..\Release\ToolTip.dll"; DestDir: "{app}"; Flags: restartreplace regserver uninsrestartdelete replacesameversion; Components: shell
[Registry]
Root: HKCR; Subkey: ".nuv"; ValueType: string; ValueName: ""; ValueData: "nuvfile"; Flags: uninsdeletekeyifempty
@@ -186,8 +71,6 @@
;this is removed for now since it apears to cause problems with windows media player
;Root: HKCR; Subkey: ".nuv"; ValueType: string; ValueName: "PerceivedType"; ValueData: "video";
-;experimental
-;Root: HKCR; Subkey: ".nuv\ShellEx\PropertyHandler"; ValueName: ""; ValueData: "{{89D472F4-2466-4E87-9EAB-8BD764EF1763}"; Components: shell
Root: HKCR; Subkey: "nuvfile"; ValueType: string; ValueName: ""; ValueData: "MythTV video file"; Flags: uninsdeletekeyifempty
Root: HKCR; Subkey: "nuvfile"; ValueType: dword; ValueName: "BrowserFlags"; ValueData: "8";
@@ -197,22 +80,30 @@
Root: HKCR; Subkey: "nuvfile\shell\convert"; Flags: createvalueifdoesntexist; ValueType: string; ValueName: ""; ValueData: "{cm:ConvToolContextMenu}";
Root: HKCR; Subkey: "nuvfile\shell\convert\command"; Flags: createvalueifdoesntexist; ValueType: string; ValueName: ""; ValueData: "{app}\NuvConv.exe /s ""%1""";
-Root: HKCR; Subkey: "nuvfile\shellex"; Flags: uninsdeletekeyifempty;
-Root: HKCR; Subkey: "nuvfile\shellex\PropertySheetHandlers"; Flags: uninsdeletekeyifempty;
-Root: HKCR; Subkey: "mpegfile\shellex\PropertySheetHandlers"; Flags: uninsdeletekeyifempty;
-Root: HKCR; Subkey: "nuvfile\shellex\{{00021500-0000-0000-C000-000000000046}"; Flags: uninsdeletekeyifempty;
-Root: HKCR; Subkey: "mpegfile\shellex\{{00021500-0000-0000-C000-000000000046}"; Flags: uninsdeletekeyifempty;
+;registry keys for shell extensions
+Root: HKCR; Subkey: "nuvfile\shellex"; Flags: uninsdeletekeyifempty; OnlyBelowVersion: 6.0,6.0; Components: shell;
+Root: HKCR; Subkey: "nuvfile\shellex\PropertySheetHandlers"; Flags: uninsdeletekeyifempty; OnlyBelowVersion: 6.0,6.0; Components: shell;
+Root: HKCR; Subkey: "mpegfile\shellex\PropertySheetHandlers"; Flags: uninsdeletekeyifempty; OnlyBelowVersion: 6.0,6.0; Components: shell;
;file propertypage
-Root: HKCR; Subkey: "nuvfile\shellex\PropertySheetHandlers\Page1"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{825D30CF-C997-420A-96CD-24EEA350F03C}"; Components: shell;
+Root: HKCR; Subkey: "nuvfile\shellex\PropertySheetHandlers\Page1"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{825D30CF-C997-420A-96CD-24EEA350F03C}"; OnlyBelowVersion: 6.0,6.0; Components: shell;
;no need for the fileinfo propertypage on mpg files, it's not going to work anyway.
-;Root: HKCR; Subkey: "mpegfile\shellex\PropertySheetHandlers\Page1"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{825D30CF-C997-420A-96CD-24EEA350F03C}"; Components: shell;
+;Root: HKCR; Subkey: "mpegfile\shellex\PropertySheetHandlers\Page1"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{825D30CF-C997-420A-96CD-24EEA350F03C}"; OnlyBelowVersion: 6.0,6.0; Components: shell;
;db propertypage
-Root: HKCR; Subkey: "nuvfile\shellex\PropertySheetHandlers\Page2"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{E6118413-72FC-4FAD-9953-5BE30CFCE358}"; Components: shell;
-Root: HKCR; Subkey: "mpegfile\shellex\PropertySheetHandlers\Page2"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{E6118413-72FC-4FAD-9953-5BE30CFCE358}"; Components: shell;
+Root: HKCR; Subkey: "nuvfile\shellex\PropertySheetHandlers\Page2"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{E6118413-72FC-4FAD-9953-5BE30CFCE358}"; OnlyBelowVersion: 6.0,6.0; Components: shell;
+Root: HKCR; Subkey: "mpegfile\shellex\PropertySheetHandlers\Page2"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{E6118413-72FC-4FAD-9953-5BE30CFCE358}"; OnlyBelowVersion: 6.0,6.0; Components: shell;
;tooltip shell extension
+Root: HKCR; Subkey: "nuvfile\shellex\{{00021500-0000-0000-C000-000000000046}"; Flags: uninsdeletekeyifempty; Components: shell;
Root: HKCR; SubKey: "nuvfile\shellex\{{00021500-0000-0000-C000-000000000046}"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{0A9A5748-13FB-4F77-8321-3536D94AB86E}"; Components: shell;
-Root: HKCR; SubKey: "mpegfile\shellex\{{00021500-0000-0000-C000-000000000046}"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{0A9A5748-13FB-4F77-8321-3536D94AB86E}"; Components: shell;
+Root: HKCR; Subkey: ".mpg\shellex\{{00021500-0000-0000-C000-000000000046}"; Flags: uninsdeletekeyifempty; Components: shell;
+Root: HKCR; SubKey: ".mpg\shellex\{{00021500-0000-0000-C000-000000000046}"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; ValueData: "{{0A9A5748-13FB-4F77-8321-3536D94AB86E}"; Components: shell;
+;registry entries for vista property handler
+Root: HKCR; SubKey: "nuvfile"; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "ExtendedTileInfo"; ValueData: "prop:System.Title;System.Media.SubTitle;System.RecordedTV.RecordingTime;System.RecordedTV.StationName;System.RecordedTV.ProgramDescription";
+Root: HKCR; SubKey: "nuvfile"; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "FullDetails"; ValueData: "prop:System.PropGroup.Description;System.Title;System.Media.SubTitle;System.Rating;System.Keywords;System.PropGroup.Media;System.Media.Year;System.Media.Duration;System.PropGroup.RecordedTV;System.RecordedTV.RecordingTime;System.RecordedTV.StationCallSign;System.RecordedTV.StationName;System.RecordedTV.ProgramDescription;System.RecordedTV.Credits;System.RecordedTV.IsRepeatBroadcast;System.RecordedTV.IsHDContent;System.RecordedTV.IsClosedCaptioningAvailable;System.PropGroup.Audio;System.Audio.ChannelCount;System.Audio.EncodingBitrate;System.Audio.SampleRate;System.PropGroup.Video;System.Video.FrameWidth;System.Video.FrameHeight;System.Video.FrameRate;System.Video.EncodingBitrate;System.PropGroup.Origin;System.Video.Director;System.Media.Producer;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.DateCreated;System.DateModified;System.Size;System.FileAttributes;System.OfflineAvailability;System.OfflineStatus;System.SharedWith;System.FileOwner;System.ComputerName";
+Root: HKCR; SubKey: "nuvfile"; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "InfoTip"; ValueData: "prop:System.Title;System.Media.SubTitle;System.RecordedTV.RecordingTime;System.RecordedTV.StationName;System.RecordedTV.ProgramDescription";
+Root: HKCR; SubKey: "nuvfile"; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "PreviewDetails"; ValueData: "prop:System.Title;System.Media.SubTitle;System.RecordedTV.StationName;System.Media.Duration;*System.RecordedTV.ProgramDescription";
+Root: HKCR; SubKey: "nuvfile"; Components: shell; MinVersion: 6.0,6.0; ValueType: string; ValueName: "PreviewTitle"; ValueData: "prop:System.Title;System.ItemType";
+
;default config settings
Root: HKLM; Subkey: "SOFTWARE\DSMyth"; Flags: uninsdeletekey;
Root: HKLM; Subkey: "SOFTWARE\DSMyth\MythSource"; Flags: createvalueifdoesntexist; ValueType: string; ValueName: "RBPath"; ValueData: "{%TEMP}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-07-21 12:44:28
|
Revision: 554
http://svn.sourceforge.net/dsmyth/?rev=554&view=rev
Author: tobbej
Date: 2007-07-21 05:44:24 -0700 (Sat, 21 Jul 2007)
Log Message:
-----------
* Make CSeekTable use CBaseReader for file access
* Make CNuvInfo use CSeekTable, less code duplication and better file length
Modified Paths:
--------------
trunk/MythTVReader/common/NuvInfo.cpp
trunk/MythTVReader/common/SeekTable.cpp
trunk/MythTVReader/common/SeekTable.h
trunk/MythTVReader/common/StreamReader.cpp
trunk/MythTVReader/common/common.vcproj
Added Paths:
-----------
trunk/MythTVReader/common/AsyncReader.cpp
trunk/MythTVReader/common/AsyncReader.h
Added: trunk/MythTVReader/common/AsyncReader.cpp
===================================================================
--- trunk/MythTVReader/common/AsyncReader.cpp (rev 0)
+++ trunk/MythTVReader/common/AsyncReader.cpp 2007-07-21 12:44:24 UTC (rev 554)
@@ -0,0 +1,61 @@
+/////////////////////////////////////////////////////////////////////////////
+// $Id$
+/////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2007 Torbj\xF6rn Jansson. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+/////////////////////////////////////////////////////////////////////////////
+
+#include "StdAfx.h"
+#include "AsyncReader.h"
+
+CAsyncReader::CAsyncReader(CComPtr<IAsyncReader> pReader)
+:m_pReader(pReader),
+m_pos(0)
+{
+
+}
+
+CAsyncReader::~CAsyncReader(void)
+{
+
+}
+
+HRESULT CAsyncReader::Seek(__int64 pos)
+{
+ if(m_pReader==NULL)
+ {
+ return E_FAIL;
+ }
+ m_pos=pos;
+ return S_OK;
+}
+
+HRESULT CAsyncReader::Read(void *pBuffer,DWORD dwBytesToRead,DWORD &dwBytesRead)
+{
+ if(m_pReader==NULL)
+ {
+ return E_FAIL;
+ }
+
+ HRESULT hr=m_pReader->SyncRead(m_pos,dwBytesRead,(BYTE*)pBuffer);
+ if(hr==S_OK)
+ {
+ dwBytesRead=dwBytesToRead;
+ m_pos+=dwBytesToRead;
+ return S_OK;
+ }
+ return hr==S_FALSE ? E_FAIL : hr ;
+}
\ No newline at end of file
Added: trunk/MythTVReader/common/AsyncReader.h
===================================================================
--- trunk/MythTVReader/common/AsyncReader.h (rev 0)
+++ trunk/MythTVReader/common/AsyncReader.h 2007-07-21 12:44:24 UTC (rev 554)
@@ -0,0 +1,37 @@
+/////////////////////////////////////////////////////////////////////////////
+// $Id$
+/////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2007 Torbj\xF6rn Jansson. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+/////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+#include "basereader.h"
+
+class CAsyncReader :
+ public CBaseReader
+{
+public:
+ CAsyncReader(CComPtr<IAsyncReader> pReader);
+ virtual ~CAsyncReader(void);
+
+ HRESULT Seek(__int64 pos);
+ HRESULT Read(void *pBuffer,DWORD dwBytesToRead,DWORD &dwBytesRead);
+
+private:
+ CComPtr<IAsyncReader> m_pReader;
+ __int64 m_pos;
+};
Modified: trunk/MythTVReader/common/NuvInfo.cpp
===================================================================
--- trunk/MythTVReader/common/NuvInfo.cpp 2007-07-16 10:06:30 UTC (rev 553)
+++ trunk/MythTVReader/common/NuvInfo.cpp 2007-07-21 12:44:24 UTC (rev 554)
@@ -26,6 +26,7 @@
#include "nuvinfo.h"
#include "filereader.h"
#include "streamreader.h"
+#include "SeekTable.h"
CNuvInfo::CNuvInfo(void)
{
@@ -189,43 +190,14 @@
}
//read the seek table
- ///@bug This seektable reading does not take the kfa table into account and
- //should be using CSeekTable class instead
info.m_bHasLength=false;
if(info.m_bUsingExtendedData && info.m_ExtendedData.seektable_offset>0)
{
- //read the seek table
- rtframeheader seekframe;
- ZeroMemory(&seekframe,FRAMEHEADERSIZE);
-
- hr=file->Seek(info.m_ExtendedData.seektable_offset);
- if(FAILED(hr))
+ CSeekTable st;
+ st.Init(file.Detach(),NULL,info.m_rtFileHeader.keyframedist,"");
+ if(st.ReadFileSeekTable(info.m_ExtendedData.seektable_offset,info.m_ExtendedData.keyframeadjust_offset))
{
- ErrorMsg="Error reading seek table";
- return true;
- }
- hr=file->Read(&seekframe,FRAMEHEADERSIZE,dwBytesRead);
- ATLASSERT(SUCCEEDED(hr) && dwBytesRead==FRAMEHEADERSIZE);
- if(seekframe.frametype!='Q')
- {
- //invalid seek table
- ErrorMsg="Invalid seek table";
- return true;
- }
-
- if(seekframe.packetlength>0)
- {
- int numentries=seekframe.packetlength/sizeof(seektable_entry);
- seektable_entry entry;
- for(int i=0;i<numentries;i++)
- {
- hr=file->Read(&entry,sizeof(entry),dwBytesRead);
- ATLASSERT(SUCCEEDED(hr) && dwBytesRead==sizeof(entry));
- ATLASSERT(entry.file_offset>0);
- }
-
- ///@bug total frames is wrong
- info.m_TotalFrames=entry.keyframe_number*info.m_rtFileHeader.keyframedist;
+ info.m_TotalFrames=st.GetMaxFrame();
info.m_TotalLength=(LONG)(info.m_TotalFrames/info.m_rtFileHeader.fps);
info.m_bHasLength=true;
}
Modified: trunk/MythTVReader/common/SeekTable.cpp
===================================================================
--- trunk/MythTVReader/common/SeekTable.cpp 2007-07-16 10:06:30 UTC (rev 553)
+++ trunk/MythTVReader/common/SeekTable.cpp 2007-07-21 12:44:24 UTC (rev 554)
@@ -27,6 +27,7 @@
#include "format.h"
#include "AutoLockCriticalSection.h"
#include "DBUtils.h"
+#include "AsyncReader.h"
CSeekTable::CSeekTable(void)
:m_MaxFrameNumber(-1),
@@ -34,14 +35,19 @@
m_bFullSeekTable(false),
m_pSendEventThread(NULL),
m_MarkType(MARK_UNSET),
-m_DBConnection(false)
+m_DBConnection(false),
+m_pReader(NULL)
{
}
CSeekTable::~CSeekTable(void)
{
-
+ if(m_pReader!=NULL)
+ {
+ delete m_pReader;
+ m_pReader=NULL;
+ }
}
void CSeekTable::AddFrame(LONGLONG frame,LONGLONG offset,bool bSendEvent)
@@ -133,6 +139,12 @@
void CSeekTable::Init(CComPtr<IAsyncReader> pReader,CComPtr<IMythSouce> pSource,int keyframedist,CAtlString filename)
{
+ CBaseReader *pR=new CAsyncReader(pReader);
+ Init(pR,pSource,keyframedist,filename);
+}
+
+void CSeekTable::Init(CBaseReader *pReader,CComPtr<IMythSouce> pSource,int keyframedist,CAtlString filename)
+{
CAutoLockCriticalSection<CComAutoCriticalSection> lock(&m_Lock);
m_pReader=pReader;
m_pMythSource=pSource;
@@ -152,6 +164,7 @@
void CSeekTable::Init(CComPtr<IMythSouce> pSource,CAtlString chanid,CAtlString starttime)
{
CAutoLockCriticalSection<CComAutoCriticalSection> lock(&m_Lock);
+ ATLASSERT(m_pReader==NULL);
m_pReader=NULL;
m_pMythSource=pSource;
m_KeyframeDist=1;
@@ -163,7 +176,11 @@
void CSeekTable::DeInit()
{
CAutoLockCriticalSection<CComAutoCriticalSection> lock(&m_Lock);
- m_pReader=NULL;
+ if(m_pReader!=NULL)
+ {
+ delete m_pReader;
+ m_pReader=NULL;
+ }
m_pMythSource=NULL;
Clear();
}
@@ -202,24 +219,25 @@
return false;
}
HRESULT hr;
+ DWORD dwBytesRead=0;
//first try to read the keyframe adjust table
CAtlMap<LONGLONG,int> kfatable;
if(kfaoffset>0)
{
rtframeheader kfa_header;
ZeroMemory(&kfa_header,FRAMEHEADERSIZE);
- hr=m_pReader->SyncRead(kfaoffset,FRAMEHEADERSIZE,(BYTE*)&kfa_header);
+ hr=m_pReader->Seek(kfaoffset);
ATLASSERT(hr==S_OK);
- kfaoffset+=FRAMEHEADERSIZE;
+ hr=m_pReader->Read((void*)&kfa_header,FRAMEHEADERSIZE,dwBytesRead);
+ ATLASSERT(hr==S_OK);
if(kfa_header.frametype=='K' && kfa_header.packetlength>0)
{
int numentries=kfa_header.packetlength/sizeof(kfatable_entry);
kfatable_entry entry;
for(int i=0;i<numentries;i++)
{
- hr=m_pReader->SyncRead(kfaoffset,sizeof(entry),(BYTE*)&entry);
+ hr=m_pReader->Read((void*)&entry,sizeof(entry),dwBytesRead);
ATLASSERT(hr==S_OK);
- kfaoffset+=sizeof(entry);
kfatable[entry.keyframe_number]=entry.adjust;
}
}
@@ -228,9 +246,10 @@
//read the seek table
rtframeheader seekframe;
ZeroMemory(&seekframe,FRAMEHEADERSIZE);
- hr=m_pReader->SyncRead(offset,FRAMEHEADERSIZE,(BYTE*)&seekframe);
+ hr=m_pReader->Seek(offset);
ATLASSERT(hr==S_OK);
- offset+=FRAMEHEADERSIZE;
+ hr=m_pReader->Read((void*)&seekframe,FRAMEHEADERSIZE,dwBytesRead);
+ ATLASSERT(hr==S_OK);
if(seekframe.frametype!='Q')
{
//invalid seek table
@@ -244,9 +263,8 @@
seektable_entry entry;
for(int i=0;i<numentries;i++)
{
- hr=m_pReader->SyncRead(offset,sizeof(entry),(BYTE*)&entry);
+ hr=m_pReader->Read((void*)&entry,sizeof(entry),dwBytesRead);
ATLASSERT(hr==S_OK);
- offset+=sizeof(entry);
ATLASSERT(entry.file_offset>0);
//apply the keyframe adjust, if any
Modified: trunk/MythTVReader/common/SeekTable.h
===================================================================
--- trunk/MythTVReader/common/SeekTable.h 2007-07-16 10:06:30 UTC (rev 553)
+++ trunk/MythTVReader/common/SeekTable.h 2007-07-21 12:44:24 UTC (rev 554)
@@ -26,6 +26,7 @@
#include "..\MythSource\MythSource.h"
#include "SendMediaEventThread.h"
#include "mysql++.h"
+#include "BaseReader.h"
enum MarkTypes
{
@@ -54,6 +55,7 @@
virtual ~CSeekTable(void);
void Init(CComPtr<IAsyncReader> pReader,CComPtr<IMythSouce> pSource,int keyframedist,CAtlString filename);
+ void Init(CBaseReader *pReader,CComPtr<IMythSouce> pSource,int keyframedist,CAtlString filename);
//this one is used for mpeg2 (MARK_GOP_BYFRAME)
void Init(CComPtr<IMythSouce> pSource,CAtlString chanid,CAtlString starttime);
/**
@@ -147,7 +149,7 @@
///Highest frame number in the seek table
LONGLONG m_MaxFrameNumber;
- CComPtr<IAsyncReader> m_pReader;
+ CBaseReader *m_pReader;
CComPtr<IMythSouce> m_pMythSource;
CSendMediaEventThread *m_pSendEventThread;
CComAutoCriticalSection m_Lock;
Modified: trunk/MythTVReader/common/StreamReader.cpp
===================================================================
--- trunk/MythTVReader/common/StreamReader.cpp 2007-07-16 10:06:30 UTC (rev 553)
+++ trunk/MythTVReader/common/StreamReader.cpp 2007-07-21 12:44:24 UTC (rev 554)
@@ -33,6 +33,10 @@
HRESULT CStreamReader::Seek(__int64 pos)
{
+ if(m_pStream==NULL)
+ {
+ return E_FAIL;
+ }
LARGE_INTEGER li;
li.QuadPart=pos;
return m_pStream->Seek(li,STREAM_SEEK_SET,NULL);
@@ -40,5 +44,9 @@
HRESULT CStreamReader::Read(void *pBuffer,DWORD dwBytesToRead,DWORD &dwBytesRead)
{
+ if(m_pStream==NULL)
+ {
+ return E_FAIL;
+ }
return m_pStream->Read(pBuffer,dwBytesToRead,&dwBytesRead);
}
\ No newline at end of file
Modified: trunk/MythTVReader/common/common.vcproj
===================================================================
--- trunk/MythTVReader/common/common.vcproj 2007-07-16 10:06:30 UTC (rev 553)
+++ trunk/MythTVReader/common/common.vcproj 2007-07-21 12:44:24 UTC (rev 554)
@@ -152,6 +152,10 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
+ RelativePath=".\AsyncReader.cpp"
+ >
+ </File>
+ <File
RelativePath=".\BackendConnection.cpp"
>
</File>
@@ -262,6 +266,10 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
+ RelativePath=".\AsyncReader.h"
+ >
+ </File>
+ <File
RelativePath=".\AutoLockCriticalSection.h"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-07-16 10:12:46
|
Revision: 553
http://svn.sourceforge.net/dsmyth/?rev=553&view=rev
Author: tobbej
Date: 2007-07-16 03:06:30 -0700 (Mon, 16 Jul 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/MythTVReader/MythTVReader.sln
Modified: trunk/MythTVReader/MythTVReader.sln
===================================================================
--- trunk/MythTVReader/MythTVReader.sln 2007-07-16 10:05:21 UTC (rev 552)
+++ trunk/MythTVReader/MythTVReader.sln 2007-07-16 10:06:30 UTC (rev 553)
@@ -2,8 +2,8 @@
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSMyth", "DSMyth\DSMyth.vcproj", "{F6B27C5D-7691-4815-81A0-0C224E72398B}"
ProjectSection(ProjectDependencies) = postProject
+ {5F161F3E-2B8B-4C77-8572-41007C10A02A} = {5F161F3E-2B8B-4C77-8572-41007C10A02A}
{8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {8A693FB2-FAA6-407B-80C7-08C5C48C5381}
- {5F161F3E-2B8B-4C77-8572-41007C10A02A} = {5F161F3E-2B8B-4C77-8572-41007C10A02A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtjpg", "rtjpg\rtjpg.vcproj", "{D5CC2DA7-33FD-4ACD-B0ED-E32418612331}"
@@ -15,9 +15,9 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MythSource", "MythSource\MythSource.vcproj", "{5F161F3E-2B8B-4C77-8572-41007C10A02A}"
ProjectSection(ProjectDependencies) = postProject
+ {366D3D7C-DEED-4F5E-B506-3B235AB0B75C} = {366D3D7C-DEED-4F5E-B506-3B235AB0B75C}
+ {4E805F8C-4927-43D8-B6E4-C8F82AF670C3} = {4E805F8C-4927-43D8-B6E4-C8F82AF670C3}
{8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {8A693FB2-FAA6-407B-80C7-08C5C48C5381}
- {4E805F8C-4927-43D8-B6E4-C8F82AF670C3} = {4E805F8C-4927-43D8-B6E4-C8F82AF670C3}
- {366D3D7C-DEED-4F5E-B506-3B235AB0B75C} = {366D3D7C-DEED-4F5E-B506-3B235AB0B75C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Config", "Config\Config.vcproj", "{4F964E4A-B778-4173-94A6-EAC25FD43885}"
@@ -49,6 +49,19 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlpp", "libs\mysql++\mysql++_mysqlpp.vcproj", "{366D3D7C-DEED-4F5E-B506-3B235AB0B75C}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shell", "Shell", "{3A7F1B91-7B97-4142-BCAC-4D13A34F835A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Filter", "Filter", "{19A276D9-CD21-45D3-8EF0-C1C04AD88B30}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{7C3AD37A-4882-496C-B58A-30ED91163101}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{1CC5D4BE-25DF-4811-9948-A31030411E25}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToolTip", "Shell\ToolTip\ToolTip.vcproj", "{C9FE1F43-9505-4F22-AF52-D732A2CB8EB1}"
+ ProjectSection(ProjectDependencies) = postProject
+ {8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {8A693FB2-FAA6-407B-80C7-08C5C48C5381}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -97,8 +110,26 @@
{366D3D7C-DEED-4F5E-B506-3B235AB0B75C}.Debug|Win32.Build.0 = Debug|Win32
{366D3D7C-DEED-4F5E-B506-3B235AB0B75C}.Release|Win32.ActiveCfg = Release|Win32
{366D3D7C-DEED-4F5E-B506-3B235AB0B75C}.Release|Win32.Build.0 = Release|Win32
+ {C9FE1F43-9505-4F22-AF52-D732A2CB8EB1}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C9FE1F43-9505-4F22-AF52-D732A2CB8EB1}.Debug|Win32.Build.0 = Debug|Win32
+ {C9FE1F43-9505-4F22-AF52-D732A2CB8EB1}.Release|Win32.ActiveCfg = Release|Win32
+ {C9FE1F43-9505-4F22-AF52-D732A2CB8EB1}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {D5CC2DA7-33FD-4ACD-B0ED-E32418612331} = {19A276D9-CD21-45D3-8EF0-C1C04AD88B30}
+ {5F161F3E-2B8B-4C77-8572-41007C10A02A} = {19A276D9-CD21-45D3-8EF0-C1C04AD88B30}
+ {F6B27C5D-7691-4815-81A0-0C224E72398B} = {19A276D9-CD21-45D3-8EF0-C1C04AD88B30}
+ {B71EB910-12E4-4C96-B0C2-5284188F2C9D} = {3A7F1B91-7B97-4142-BCAC-4D13A34F835A}
+ {F65AED6A-743C-4E23-A6B3-C17F4A19196B} = {3A7F1B91-7B97-4142-BCAC-4D13A34F835A}
+ {A25C39EC-460F-4992-A46A-A8E07F47F98B} = {3A7F1B91-7B97-4142-BCAC-4D13A34F835A}
+ {C9FE1F43-9505-4F22-AF52-D732A2CB8EB1} = {3A7F1B91-7B97-4142-BCAC-4D13A34F835A}
+ {86F43618-AE3C-481F-881F-F9871437A0FA} = {7C3AD37A-4882-496C-B58A-30ED91163101}
+ {4F964E4A-B778-4173-94A6-EAC25FD43885} = {7C3AD37A-4882-496C-B58A-30ED91163101}
+ {4E805F8C-4927-43D8-B6E4-C8F82AF670C3} = {1CC5D4BE-25DF-4811-9948-A31030411E25}
+ {366D3D7C-DEED-4F5E-B506-3B235AB0B75C} = {1CC5D4BE-25DF-4811-9948-A31030411E25}
+ {8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {1CC5D4BE-25DF-4811-9948-A31030411E25}
+ EndGlobalSection
EndGlobal
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-07-16 10:08:01
|
Revision: 552
http://svn.sourceforge.net/dsmyth/?rev=552&view=rev
Author: tobbej
Date: 2007-07-16 03:05:21 -0700 (Mon, 16 Jul 2007)
Log Message:
-----------
encoding bitrate is ULONG and not BOOL
Modified Paths:
--------------
trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp
Modified: trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp
===================================================================
--- trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp 2007-07-15 13:33:20 UTC (rev 551)
+++ trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp 2007-07-16 10:05:21 UTC (rev 552)
@@ -306,7 +306,7 @@
StoreDataInCache(PKEY_Audio_Compression,L"PCM");
}
- StoreDataInCache(PKEY_Video_EncodingBitrate,info.m_ExtendedData.lavc_bitrate);
+ StoreDataInCache(PKEY_Video_EncodingBitrate,(ULONG)info.m_ExtendedData.lavc_bitrate);
StoreDataInCache(PKEY_Video_FourCC,(ULONG)info.m_ExtendedData.video_fourcc);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-07-15 13:33:22
|
Revision: 551
http://svn.sourceforge.net/dsmyth/?rev=551&view=rev
Author: tobbej
Date: 2007-07-15 06:33:20 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
Move ToolTip shell extension to it's own project.
Modified Paths:
--------------
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.idl
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.rc
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.vcproj
trunk/MythTVReader/reg-debug.bat
trunk/MythTVReader/reg-release.bat
Added Paths:
-----------
trunk/MythTVReader/Shell/ToolTip/
trunk/MythTVReader/Shell/ToolTip/NuvToolTip.cpp
trunk/MythTVReader/Shell/ToolTip/NuvToolTip.h
trunk/MythTVReader/Shell/ToolTip/NuvToolTip.rgs
trunk/MythTVReader/Shell/ToolTip/Resource.h
trunk/MythTVReader/Shell/ToolTip/ToolTip.cpp
trunk/MythTVReader/Shell/ToolTip/ToolTip.def
trunk/MythTVReader/Shell/ToolTip/ToolTip.idl
trunk/MythTVReader/Shell/ToolTip/ToolTip.rc
trunk/MythTVReader/Shell/ToolTip/ToolTip.rgs
trunk/MythTVReader/Shell/ToolTip/ToolTip.vcproj
trunk/MythTVReader/Shell/ToolTip/dlldatax.c
trunk/MythTVReader/Shell/ToolTip/dlldatax.h
trunk/MythTVReader/Shell/ToolTip/stdafx.cpp
trunk/MythTVReader/Shell/ToolTip/stdafx.h
Removed Paths:
-------------
trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.cpp
trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.h
trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.rgs
Modified: trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.idl
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.idl 2007-07-15 12:35:40 UTC (rev 550)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.idl 2007-07-15 13:33:20 UTC (rev 551)
@@ -39,12 +39,4 @@
{
[default] interface IUnknown;
};
- [
- uuid(0A9A5748-13FB-4F77-8321-3536D94AB86E),
- helpstring("NuvToolTip Class")
- ]
- coclass NuvToolTip
- {
- [default] interface IUnknown;
- };
};
Modified: trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.rc
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.rc 2007-07-15 12:35:40 UTC (rev 550)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.rc 2007-07-15 13:33:20 UTC (rev 551)
@@ -94,7 +94,6 @@
IDR_NUVPROPS REGISTRY "NuvProps.rgs"
IDR_NUVCOLHANDLER REGISTRY "NuvColHandler.rgs"
IDR_NUVDBPROPS REGISTRY "NuvDBProps.rgs"
-IDR_NUVTOOLTIP REGISTRY "NuvToolTip.rgs"
/////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.vcproj
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.vcproj 2007-07-15 12:35:40 UTC (rev 550)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.vcproj 2007-07-15 13:33:20 UTC (rev 551)
@@ -249,10 +249,6 @@
>
</File>
<File
- RelativePath=".\NuvToolTip.cpp"
- >
- </File>
- <File
RelativePath="stdafx.cpp"
>
<FileConfiguration
@@ -294,10 +290,6 @@
>
</File>
<File
- RelativePath=".\NuvToolTip.h"
- >
- </File>
- <File
RelativePath="Resource.h"
>
</File>
@@ -330,10 +322,6 @@
RelativePath="NuvProps.rgs"
>
</File>
- <File
- RelativePath=".\NuvToolTip.rgs"
- >
- </File>
</Filter>
<Filter
Name="Generated Files"
Deleted: trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.cpp
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.cpp 2007-07-15 12:35:40 UTC (rev 550)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.cpp 2007-07-15 13:33:20 UTC (rev 551)
@@ -1,137 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// $Id$
-/////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2005 Torbj\xF6rn Jansson. All rights reserved.
-/////////////////////////////////////////////////////////////////////////////
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-/////////////////////////////////////////////////////////////////////////////
-
-// NuvToolTip.cpp : Implementation of CNuvToolTip
-
-#include "stdafx.h"
-#include "NuvToolTip.h"
-
-// CNuvToolTip
-CNuvToolTip::CNuvToolTip()
-{
-}
-
-HRESULT CNuvToolTip::FinalConstruct()
-{
- return S_OK;
-}
-
-void CNuvToolTip::FinalRelease()
-{
-}
-
-// IPersistFile
-HRESULT CNuvToolTip::GetClassID(CLSID *pCLSID)
-{
- *pCLSID=CLSID_NuvToolTip;
- return S_OK;
-}
-
-HRESULT CNuvToolTip::IsDirty()
-{
- return E_NOTIMPL;
-}
-
-HRESULT CNuvToolTip::Load(LPCOLESTR wszFilename, DWORD dwMode)
-{
- m_FileName=wszFilename;
- return S_OK;
-}
-
-HRESULT CNuvToolTip::Save(LPCOLESTR, BOOL)
-{
- return E_NOTIMPL;
-}
-
-HRESULT CNuvToolTip::SaveCompleted(LPCOLESTR)
-{
- return E_NOTIMPL;
-}
-
-HRESULT CNuvToolTip::GetCurFile(LPOLESTR*)
-{
- return E_NOTIMPL;
-}
-
-// IQueryInfo
-HRESULT CNuvToolTip::GetInfoFlags(DWORD*)
-{
- return E_NOTIMPL;
-}
-
-HRESULT CNuvToolTip::GetInfoTip(DWORD dwFlags,LPWSTR* ppwszTip)
-{
- CComPtr<IMalloc> pMalloc;
- HRESULT hr=SHGetMalloc(&pMalloc);
- if(FAILED(hr))
- {
- return hr;
- }
-
- *ppwszTip=NULL;
-
- CAtlString oldlocale=setlocale(LC_ALL,NULL);
- setlocale(LC_ALL,"");
-
- CNuvInfo::CFileInfo fileinfo;
- m_info.GetInfo(CAtlString(m_FileName.GetBuffer()),fileinfo);
- if(fileinfo.m_bProgramInfoLoaded)
- {
- CAtlStringW tip;
- tip="Title: ";
- tip+=fileinfo.m_ProgramInfo.m_title;
- if(fileinfo.m_ProgramInfo.m_subtitle.GetLength()>0)
- {
- tip+=": ";
- tip+=fileinfo.m_ProgramInfo.m_subtitle;
- }
- tip+="\n";
-
- if(fileinfo.m_ProgramInfo.m_category.GetLength()>0)
- {
- tip+="Category: ";
- tip+=fileinfo.m_ProgramInfo.m_category;
- tip+="\n";
- }
-
- tip+="Recorded at: ";
- tip+=fileinfo.m_ProgramInfo.m_startts.Format("%c");
- if(fileinfo.m_ProgramInfo.m_channame.GetLength()>0)
- {
- tip+=" on ";
- tip+=fileinfo.m_ProgramInfo.m_channame;
- }
-
- tip+="\n\n";
-
- tip+=fileinfo.m_ProgramInfo.m_description;
- setlocale(LC_ALL,oldlocale);
-
- size_t len=tip.GetLength()+1;
- *ppwszTip=(LPWSTR)pMalloc->Alloc(len*sizeof(wchar_t));
- if(ppwszTip==NULL)
- {
- return E_OUTOFMEMORY;
- }
- wcscpy_s(*ppwszTip,len,tip.GetBuffer());
- }
-
- return S_OK;
-}
\ No newline at end of file
Deleted: trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.h
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.h 2007-07-15 12:35:40 UTC (rev 550)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.h 2007-07-15 13:33:20 UTC (rev 551)
@@ -1,75 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// $Id$
-/////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2005 Torbj\xF6rn Jansson. All rights reserved.
-/////////////////////////////////////////////////////////////////////////////
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-/////////////////////////////////////////////////////////////////////////////
-
-/**
- * @file NuvToolTip.h Declaration of the CNuvToolTip
- */
-
-#pragma once
-#include "resource.h" // main symbols
-
-#include "NuvPropPage.h"
-#include "NuvInfo.h"
-
-/**
- * Tool tip shell extension for *.nuv files.
- * Works on both mpeg2 and nupplevideo type nuv files (mpeg4/rtjpeg).
- * Requires connection to the mysql database for mythtv.
- */
-class ATL_NO_VTABLE CNuvToolTip :
- public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CNuvToolTip, &CLSID_NuvToolTip>,
- public IPersistFile,
- public IQueryInfo
-{
-public:
- CNuvToolTip();
-
-DECLARE_REGISTRY_RESOURCEID(IDR_NUVTOOLTIP)
-
-
-BEGIN_COM_MAP(CNuvToolTip)
- COM_INTERFACE_ENTRY(IPersistFile)
- COM_INTERFACE_ENTRY_IID(IID_IQueryInfo,IQueryInfo)
-END_COM_MAP()
-
- DECLARE_PROTECT_FINAL_CONSTRUCT()
-
- HRESULT FinalConstruct();
- void FinalRelease() ;
-
-public:
-// IPersistFile
- STDMETHOD(GetClassID)(CLSID *pCLSID);
- STDMETHOD(IsDirty)();
- STDMETHOD(Load)(LPCOLESTR, DWORD);
- STDMETHOD(Save)(LPCOLESTR, BOOL);
- STDMETHOD(SaveCompleted)(LPCOLESTR);
- STDMETHOD(GetCurFile)(LPOLESTR*);
-
-// IQueryInfo
- STDMETHOD(GetInfoFlags)(DWORD*);
- STDMETHOD(GetInfoTip)(DWORD, LPWSTR*);
-private:
- CAtlStringW m_FileName;
- CNuvInfo m_info;
-};
-
-OBJECT_ENTRY_AUTO(__uuidof(NuvToolTip), CNuvToolTip)
Deleted: trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.rgs
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.rgs 2007-07-15 12:35:40 UTC (rev 550)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.rgs 2007-07-15 13:33:20 UTC (rev 551)
@@ -1,26 +0,0 @@
-HKCR
-{
- NuvPropPage.NuvToolTip.1 = s 'NuvToolTip Class'
- {
- CLSID = s '{0A9A5748-13FB-4F77-8321-3536D94AB86E}'
- }
- NuvPropPage.NuvToolTip = s 'NuvToolTip Class'
- {
- CLSID = s '{0A9A5748-13FB-4F77-8321-3536D94AB86E}'
- CurVer = s 'NuvPropPage.NuvToolTip.1'
- }
- NoRemove CLSID
- {
- ForceRemove {0A9A5748-13FB-4F77-8321-3536D94AB86E} = s 'NuvToolTip Class'
- {
- ProgID = s 'NuvPropPage.NuvToolTip.1'
- VersionIndependentProgID = s 'NuvPropPage.NuvToolTip'
- InprocServer32 = s '%MODULE%'
- {
- val ThreadingModel = s 'Apartment'
- }
- val AppID = s '%APPID%'
- 'TypeLib' = s '{A9983193-2815-4899-A4A1-1CBED6AD4655}'
- }
- }
-}
Property changes on: trunk/MythTVReader/Shell/ToolTip
___________________________________________________________________
Name: svn:ignore
+ ToolTip_i.c
ToolTip.h
Debug
Release
*.aps
dlldata.c
*.user
Copied: trunk/MythTVReader/Shell/ToolTip/NuvToolTip.cpp (from rev 550, trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.cpp)
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/NuvToolTip.cpp (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/NuvToolTip.cpp 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,137 @@
+/////////////////////////////////////////////////////////////////////////////
+// $Id$
+/////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2005 Torbj\xF6rn Jansson. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+/////////////////////////////////////////////////////////////////////////////
+
+// NuvToolTip.cpp : Implementation of CNuvToolTip
+
+#include "stdafx.h"
+#include "NuvToolTip.h"
+
+// CNuvToolTip
+CNuvToolTip::CNuvToolTip()
+{
+}
+
+HRESULT CNuvToolTip::FinalConstruct()
+{
+ return S_OK;
+}
+
+void CNuvToolTip::FinalRelease()
+{
+}
+
+// IPersistFile
+HRESULT CNuvToolTip::GetClassID(CLSID *pCLSID)
+{
+ *pCLSID=CLSID_NuvToolTip;
+ return S_OK;
+}
+
+HRESULT CNuvToolTip::IsDirty()
+{
+ return E_NOTIMPL;
+}
+
+HRESULT CNuvToolTip::Load(LPCOLESTR wszFilename, DWORD dwMode)
+{
+ m_FileName=wszFilename;
+ return S_OK;
+}
+
+HRESULT CNuvToolTip::Save(LPCOLESTR, BOOL)
+{
+ return E_NOTIMPL;
+}
+
+HRESULT CNuvToolTip::SaveCompleted(LPCOLESTR)
+{
+ return E_NOTIMPL;
+}
+
+HRESULT CNuvToolTip::GetCurFile(LPOLESTR*)
+{
+ return E_NOTIMPL;
+}
+
+// IQueryInfo
+HRESULT CNuvToolTip::GetInfoFlags(DWORD*)
+{
+ return E_NOTIMPL;
+}
+
+HRESULT CNuvToolTip::GetInfoTip(DWORD dwFlags,LPWSTR* ppwszTip)
+{
+ CComPtr<IMalloc> pMalloc;
+ HRESULT hr=SHGetMalloc(&pMalloc);
+ if(FAILED(hr))
+ {
+ return hr;
+ }
+
+ *ppwszTip=NULL;
+
+ CAtlString oldlocale=setlocale(LC_ALL,NULL);
+ setlocale(LC_ALL,"");
+
+ CNuvInfo::CFileInfo fileinfo;
+ m_info.GetInfo(CAtlString(m_FileName.GetBuffer()),fileinfo);
+ if(fileinfo.m_bProgramInfoLoaded)
+ {
+ CAtlStringW tip;
+ tip="Title: ";
+ tip+=fileinfo.m_ProgramInfo.m_title;
+ if(fileinfo.m_ProgramInfo.m_subtitle.GetLength()>0)
+ {
+ tip+=": ";
+ tip+=fileinfo.m_ProgramInfo.m_subtitle;
+ }
+ tip+="\n";
+
+ if(fileinfo.m_ProgramInfo.m_category.GetLength()>0)
+ {
+ tip+="Category: ";
+ tip+=fileinfo.m_ProgramInfo.m_category;
+ tip+="\n";
+ }
+
+ tip+="Recorded at: ";
+ tip+=fileinfo.m_ProgramInfo.m_startts.Format("%c");
+ if(fileinfo.m_ProgramInfo.m_channame.GetLength()>0)
+ {
+ tip+=" on ";
+ tip+=fileinfo.m_ProgramInfo.m_channame;
+ }
+
+ tip+="\n\n";
+
+ tip+=fileinfo.m_ProgramInfo.m_description;
+ setlocale(LC_ALL,oldlocale);
+
+ size_t len=tip.GetLength()+1;
+ *ppwszTip=(LPWSTR)pMalloc->Alloc(len*sizeof(wchar_t));
+ if(ppwszTip==NULL)
+ {
+ return E_OUTOFMEMORY;
+ }
+ wcscpy_s(*ppwszTip,len,tip.GetBuffer());
+ return S_OK;
+ }
+ return E_FAIL;
+}
\ No newline at end of file
Copied: trunk/MythTVReader/Shell/ToolTip/NuvToolTip.h (from rev 550, trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.h)
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/NuvToolTip.h (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/NuvToolTip.h 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,75 @@
+/////////////////////////////////////////////////////////////////////////////
+// $Id$
+/////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2005 Torbj\xF6rn Jansson. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+ * @file NuvToolTip.h Declaration of the CNuvToolTip
+ */
+
+#pragma once
+#include "resource.h" // main symbols
+
+#include "NuvInfo.h"
+#include "ToolTip.h"
+
+/**
+ * Tool tip shell extension for *.nuv files.
+ * Works on both mpeg2 and nupplevideo type nuv files (mpeg4/rtjpeg).
+ * Requires connection to the mysql database for mythtv.
+ */
+class ATL_NO_VTABLE CNuvToolTip :
+ public CComObjectRootEx<CComSingleThreadModel>,
+ public CComCoClass<CNuvToolTip, &CLSID_NuvToolTip>,
+ public IPersistFile,
+ public IQueryInfo
+{
+public:
+ CNuvToolTip();
+
+DECLARE_REGISTRY_RESOURCEID(IDR_NUVTOOLTIP)
+
+
+BEGIN_COM_MAP(CNuvToolTip)
+ COM_INTERFACE_ENTRY(IPersistFile)
+ COM_INTERFACE_ENTRY_IID(IID_IQueryInfo,IQueryInfo)
+END_COM_MAP()
+
+ DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+ HRESULT FinalConstruct();
+ void FinalRelease() ;
+
+public:
+// IPersistFile
+ STDMETHOD(GetClassID)(CLSID *pCLSID);
+ STDMETHOD(IsDirty)();
+ STDMETHOD(Load)(LPCOLESTR, DWORD);
+ STDMETHOD(Save)(LPCOLESTR, BOOL);
+ STDMETHOD(SaveCompleted)(LPCOLESTR);
+ STDMETHOD(GetCurFile)(LPOLESTR*);
+
+// IQueryInfo
+ STDMETHOD(GetInfoFlags)(DWORD*);
+ STDMETHOD(GetInfoTip)(DWORD, LPWSTR*);
+private:
+ CAtlStringW m_FileName;
+ CNuvInfo m_info;
+};
+
+OBJECT_ENTRY_AUTO(__uuidof(NuvToolTip), CNuvToolTip)
Copied: trunk/MythTVReader/Shell/ToolTip/NuvToolTip.rgs (from rev 550, trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.rgs)
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/NuvToolTip.rgs (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/NuvToolTip.rgs 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,26 @@
+HKCR
+{
+ NuvPropPage.NuvToolTip.1 = s 'NuvToolTip Class'
+ {
+ CLSID = s '{0A9A5748-13FB-4F77-8321-3536D94AB86E}'
+ }
+ NuvPropPage.NuvToolTip = s 'NuvToolTip Class'
+ {
+ CLSID = s '{0A9A5748-13FB-4F77-8321-3536D94AB86E}'
+ CurVer = s 'NuvPropPage.NuvToolTip.1'
+ }
+ NoRemove CLSID
+ {
+ ForceRemove {0A9A5748-13FB-4F77-8321-3536D94AB86E} = s 'NuvToolTip Class'
+ {
+ ProgID = s 'NuvPropPage.NuvToolTip.1'
+ VersionIndependentProgID = s 'NuvPropPage.NuvToolTip'
+ InprocServer32 = s '%MODULE%'
+ {
+ val ThreadingModel = s 'Apartment'
+ }
+ val AppID = s '%APPID%'
+ 'TypeLib' = s '{A9983193-2815-4899-A4A1-1CBED6AD4655}'
+ }
+ }
+}
Added: trunk/MythTVReader/Shell/ToolTip/Resource.h
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/Resource.h (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/Resource.h 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,19 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by ToolTip.rc
+//
+
+#define IDS_PROJNAME 100
+#define IDR_TOOLTIP 101
+#define IDR_NUVTOOLTIP 102
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 201
+#define _APS_NEXT_COMMAND_VALUE 32768
+#define _APS_NEXT_CONTROL_VALUE 201
+#define _APS_NEXT_SYMED_VALUE 103
+#endif
+#endif
Added: trunk/MythTVReader/Shell/ToolTip/ToolTip.cpp
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/ToolTip.cpp (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/ToolTip.cpp 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,93 @@
+// ToolTip.cpp : Implementation of DLL Exports.
+
+
+#include "stdafx.h"
+#include "resource.h"
+#include "ToolTip.h"
+#include "dlldatax.h"
+
+
+class CToolTipModule : public CAtlDllModuleT< CToolTipModule >
+{
+public :
+ DECLARE_LIBID(LIBID_ToolTipLib)
+ DECLARE_REGISTRY_APPID_RESOURCEID(IDR_TOOLTIP, "{33ED669D-0DB7-4241-A47E-4C8053218EF1}")
+};
+
+CToolTipModule _AtlModule;
+
+
+#ifdef _MANAGED
+#pragma managed(push, off)
+#endif
+
+// DLL Entry Point
+extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
+{
+#ifdef _MERGE_PROXYSTUB
+ if (!PrxDllMain(hInstance, dwReason, lpReserved))
+ return FALSE;
+#endif
+ hInstance;
+ return _AtlModule.DllMain(dwReason, lpReserved);
+}
+
+#ifdef _MANAGED
+#pragma managed(pop)
+#endif
+
+
+
+
+// Used to determine whether the DLL can be unloaded by OLE
+STDAPI DllCanUnloadNow(void)
+{
+#ifdef _MERGE_PROXYSTUB
+ HRESULT hr = PrxDllCanUnloadNow();
+ if (hr != S_OK)
+ return hr;
+#endif
+ return _AtlModule.DllCanUnloadNow();
+}
+
+
+// Returns a class factory to create an object of the requested type
+STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
+{
+#ifdef _MERGE_PROXYSTUB
+ if (PrxDllGetClassObject(rclsid, riid, ppv) == S_OK)
+ return S_OK;
+#endif
+ return _AtlModule.DllGetClassObject(rclsid, riid, ppv);
+}
+
+
+// DllRegisterServer - Adds entries to the system registry
+STDAPI DllRegisterServer(void)
+{
+ // registers object, typelib and all interfaces in typelib
+ HRESULT hr = _AtlModule.DllRegisterServer();
+#ifdef _MERGE_PROXYSTUB
+ if (FAILED(hr))
+ return hr;
+ hr = PrxDllRegisterServer();
+#endif
+ return hr;
+}
+
+
+// DllUnregisterServer - Removes entries from the system registry
+STDAPI DllUnregisterServer(void)
+{
+ HRESULT hr = _AtlModule.DllUnregisterServer();
+#ifdef _MERGE_PROXYSTUB
+ if (FAILED(hr))
+ return hr;
+ hr = PrxDllRegisterServer();
+ if (FAILED(hr))
+ return hr;
+ hr = PrxDllUnregisterServer();
+#endif
+ return hr;
+}
+
Added: trunk/MythTVReader/Shell/ToolTip/ToolTip.def
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/ToolTip.def (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/ToolTip.def 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,9 @@
+; ToolTip.def : Declares the module parameters.
+
+LIBRARY "ToolTip.DLL"
+
+EXPORTS
+ DllCanUnloadNow PRIVATE
+ DllGetClassObject PRIVATE
+ DllRegisterServer PRIVATE
+ DllUnregisterServer PRIVATE
Added: trunk/MythTVReader/Shell/ToolTip/ToolTip.idl
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/ToolTip.idl (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/ToolTip.idl 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,26 @@
+// ToolTip.idl : IDL source for ToolTip
+//
+
+// This file will be processed by the MIDL tool to
+// produce the type library (ToolTip.tlb) and marshalling code.
+
+import "oaidl.idl";
+import "ocidl.idl";
+
+[
+ uuid(4CF925D1-73C6-40FC-A22D-F35F575E3CE0),
+ version(1.0),
+ helpstring("ToolTip 1.0 Type Library")
+]
+library ToolTipLib
+{
+ importlib("stdole2.tlb");
+ [
+ uuid(0A9A5748-13FB-4F77-8321-3536D94AB86E),
+ helpstring("NuvToolTip Class")
+ ]
+ coclass NuvToolTip
+ {
+ [default] interface IUnknown;
+ };
+};
Added: trunk/MythTVReader/Shell/ToolTip/ToolTip.rc
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/ToolTip.rc (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/ToolTip.rc 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,133 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (Neutral) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904e4"
+ BEGIN
+ VALUE "CompanyName", "TODO: <Company name>"
+ VALUE "FileDescription", "TODO: <File description>"
+ VALUE "FileVersion", "1.0.0.1"
+ VALUE "LegalCopyright", "TODO: (c) <Company name>. All rights reserved."
+ VALUE "InternalName", "ToolTip.dll"
+ VALUE "OriginalFilename", "ToolTip.dll"
+ VALUE "ProductName", "TODO: <Product name>"
+ VALUE "ProductVersion", "1.0.0.1"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1252
+ END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// REGISTRY
+//
+
+IDR_TOOLTIP REGISTRY "ToolTip.rgs"
+IDR_NUVTOOLTIP REGISTRY "NuvToolTip.rgs"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+ IDS_PROJNAME "ToolTip"
+END
+
+#endif // English (Neutral) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Swedish resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
+#ifdef _WIN32
+LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""winres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "1 TYPELIB ""ToolTip.tlb""\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // Swedish resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+1 TYPELIB "ToolTip.tlb"
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Added: trunk/MythTVReader/Shell/ToolTip/ToolTip.rgs
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/ToolTip.rgs (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/ToolTip.rgs 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,11 @@
+HKCR
+{
+ NoRemove AppID
+ {
+ '%APPID%' = s 'ToolTip'
+ 'ToolTip.DLL'
+ {
+ val AppID = s '%APPID%'
+ }
+ }
+}
Added: trunk/MythTVReader/Shell/ToolTip/ToolTip.vcproj
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/ToolTip.vcproj (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/ToolTip.vcproj 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8,00"
+ Name="ToolTip"
+ ProjectGUID="{C9FE1F43-9505-4F22-AF52-D732A2CB8EB1}"
+ RootNamespace="ToolTip"
+ Keyword="AtlProj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ UseOfATL="2"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="false"
+ TargetEnvironment="1"
+ GenerateStublessProxies="true"
+ TypeLibraryName="$(IntDir)/ToolTip.tlb"
+ HeaderFileName="ToolTip.h"
+ DLLDataFileName=""
+ InterfaceIdentifierFileName="ToolTip_i.c"
+ ProxyFileName="ToolTip_p.c"
+ ValidateParameters="false"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\common;"..\..\libs\mysql++\lib""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="$(IntDir)"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RegisterOutput="true"
+ IgnoreImportLibrary="true"
+ AdditionalDependencies="ws2_32.lib quartz.lib"
+ LinkIncremental="2"
+ ModuleDefinitionFile=".\ToolTip.def"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ UseOfATL="2"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="false"
+ TargetEnvironment="1"
+ GenerateStublessProxies="true"
+ TypeLibraryName="$(IntDir)/ToolTip.tlb"
+ HeaderFileName="ToolTip.h"
+ DLLDataFileName=""
+ InterfaceIdentifierFileName="ToolTip_i.c"
+ ProxyFileName="ToolTip_p.c"
+ ValidateParameters="false"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\..\common;"..\..\libs\mysql++\lib""
+ PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="$(IntDir)"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RegisterOutput="true"
+ IgnoreImportLibrary="true"
+ AdditionalDependencies="ws2_32.lib quartz.lib"
+ LinkIncremental="1"
+ ModuleDefinitionFile=".\ToolTip.def"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\dlldatax.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\NuvToolTip.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\stdafx.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\ToolTip.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\ToolTip.def"
+ >
+ </File>
+ <File
+ RelativePath=".\ToolTip.idl"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath=".\dlldatax.h"
+ >
+ </File>
+ <File
+ RelativePath=".\NuvToolTip.h"
+ >
+ </File>
+ <File
+ RelativePath=".\Resource.h"
+ >
+ </File>
+ <File
+ RelativePath=".\stdafx.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ <File
+ RelativePath=".\NuvToolTip.rgs"
+ >
+ </File>
+ <File
+ RelativePath=".\ToolTip.rc"
+ >
+ </File>
+ <File
+ RelativePath=".\ToolTip.rgs"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Generated Files"
+ SourceControlFiles="false"
+ >
+ <File
+ RelativePath=".\ToolTip.h"
+ >
+ </File>
+ <File
+ RelativePath=".\ToolTip_i.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: trunk/MythTVReader/Shell/ToolTip/dlldatax.c
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/dlldatax.c (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/dlldatax.c 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,18 @@
+// wrapper for dlldata.c
+
+#ifdef _MERGE_PROXYSTUB // merge proxy stub DLL
+
+#define REGISTER_PROXY_DLL //DllRegisterServer, etc.
+
+#define _WIN32_WINNT 0x0500 //for WinNT 4.0 or Win95 with DCOM
+#define USE_STUBLESS_PROXY //defined only with MIDL switch /Oicf
+
+#pragma comment(lib, "rpcns4.lib")
+#pragma comment(lib, "rpcrt4.lib")
+
+#define ENTRY_PREFIX Prx
+
+#include "dlldata.c"
+#include "ToolTip_p.c"
+
+#endif //_MERGE_PROXYSTUB
Added: trunk/MythTVReader/Shell/ToolTip/dlldatax.h
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/dlldatax.h (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/dlldatax.h 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,15 @@
+#pragma once
+
+#ifdef _MERGE_PROXYSTUB
+
+extern "C"
+{
+BOOL WINAPI PrxDllMain(HINSTANCE hInstance, DWORD dwReason,
+ LPVOID lpReserved);
+STDAPI PrxDllCanUnloadNow(void);
+STDAPI PrxDllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv);
+STDAPI PrxDllRegisterServer(void);
+STDAPI PrxDllUnregisterServer(void);
+}
+
+#endif
Added: trunk/MythTVReader/Shell/ToolTip/stdafx.cpp
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/stdafx.cpp (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/stdafx.cpp 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,5 @@
+// stdafx.cpp : source file that includes just the standard includes
+// ToolTip.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
Added: trunk/MythTVReader/Shell/ToolTip/stdafx.h
===================================================================
--- trunk/MythTVReader/Shell/ToolTip/stdafx.h (rev 0)
+++ trunk/MythTVReader/Shell/ToolTip/stdafx.h 2007-07-15 13:33:20 UTC (rev 551)
@@ -0,0 +1,46 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently,
+// but are changed infrequently
+
+#pragma once
+
+#ifndef STRICT
+#define STRICT
+#endif
+
+// Modify the following defines if you have to target a platform prior to the ones specified below.
+// Refer to MSDN for the latest info on corresponding values for different platforms.
+#ifndef WINVER // Allow use of features specific to Windows XP or later.
+#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows.
+#endif
+
+#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later.
+#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
+#endif
+
+#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
+#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
+#endif
+
+#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later.
+#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
+#endif
+
+#define _ATL_APARTMENT_THREADED
+#define _ATL_NO_AUTOMATIC_NAMESPACE
+
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
+
+
+#include "resource.h"
+#include <atlbase.h>
+#include <atlcom.h>
+
+#include <comdef.h>
+#include <shlobj.h>
+#include <atlstr.h>
+#include <atltime.h>
+#include <ATLComTime.h>
+#include <atlcoll.h>
+
+using namespace ATL;
\ No newline at end of file
Modified: trunk/MythTVReader/reg-debug.bat
===================================================================
--- trunk/MythTVReader/reg-debug.bat 2007-07-15 12:35:40 UTC (rev 550)
+++ trunk/MythTVReader/reg-debug.bat 2007-07-15 13:33:20 UTC (rev 551)
@@ -9,4 +9,6 @@
regsvr32 /u Debug\rtjpg.dll
regsvr32 Debug\rtjpg.dll
regsvr32 /u Debug\PropertyHandler.dll
-regsvr32 Debug\PropertyHandler.dll
\ No newline at end of file
+regsvr32 Debug\PropertyHandler.dll
+regsvr32 /u Debug\ToolTip.dll
+regsvr32 Debug\ToolTip.dll
\ No newline at end of file
Modified: trunk/MythTVReader/reg-release.bat
===================================================================
--- trunk/MythTVReader/reg-release.bat 2007-07-15 12:35:40 UTC (rev 550)
+++ trunk/MythTVReader/reg-release.bat 2007-07-15 13:33:20 UTC (rev 551)
@@ -9,4 +9,6 @@
regsvr32 /u Release\rtjpg.dll
regsvr32 Release\rtjpg.dll
regsvr32 /u Release\PropertyHandler.dll
-regsvr32 Release\PropertyHandler.dll
\ No newline at end of file
+regsvr32 Release\PropertyHandler.dll
+regsvr32 /u Release\ToolTip.dll
+regsvr32 Release\ToolTip.dll
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-07-15 12:35:42
|
Revision: 550
http://svn.sourceforge.net/dsmyth/?rev=550&view=rev
Author: tobbej
Date: 2007-07-15 05:35:40 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
Move shell related code to it's own directory
Modified Paths:
--------------
trunk/MythTVReader/MythTVReader.sln
Added Paths:
-----------
trunk/MythTVReader/Shell/
trunk/MythTVReader/Shell/NuvPropPage/
trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.cpp
trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.h
trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.rgs
trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.cpp
trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.h
trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.rgs
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.cpp
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.def
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.idl
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.rc
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.rgs
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.vcproj
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPagePS.vcproj
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPageps.def
trunk/MythTVReader/Shell/NuvPropPage/NuvProps.cpp
trunk/MythTVReader/Shell/NuvPropPage/NuvProps.h
trunk/MythTVReader/Shell/NuvPropPage/NuvProps.rgs
trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.cpp
trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.h
trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.rgs
trunk/MythTVReader/Shell/NuvPropPage/custprops.h
trunk/MythTVReader/Shell/NuvPropPage/resource.h
trunk/MythTVReader/Shell/NuvPropPage/stdafx.cpp
trunk/MythTVReader/Shell/NuvPropPage/stdafx.h
trunk/MythTVReader/Shell/PropertyHandler/
trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp
trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.h
trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.rgs
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.cpp
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.def
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.idl
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.rc
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.rgs
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.vcproj
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandlerPS.vcproj
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandlerps.def
trunk/MythTVReader/Shell/PropertyHandler/resource.h
trunk/MythTVReader/Shell/PropertyHandler/stdafx.cpp
trunk/MythTVReader/Shell/PropertyHandler/stdafx.h
Removed Paths:
-------------
trunk/MythTVReader/NuvPropPage/
trunk/MythTVReader/PropertyHandler/
trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.cpp
trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.h
trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.rgs
trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.cpp
trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.h
trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.rgs
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.cpp
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.def
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.idl
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.rc
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.rgs
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.vcproj
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPagePS.vcproj
trunk/MythTVReader/Shell/NuvPropPage/NuvPropPageps.def
trunk/MythTVReader/Shell/NuvPropPage/NuvProps.cpp
trunk/MythTVReader/Shell/NuvPropPage/NuvProps.h
trunk/MythTVReader/Shell/NuvPropPage/NuvProps.rgs
trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.cpp
trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.h
trunk/MythTVReader/Shell/NuvPropPage/NuvToolTip.rgs
trunk/MythTVReader/Shell/NuvPropPage/custprops.h
trunk/MythTVReader/Shell/NuvPropPage/resource.h
trunk/MythTVReader/Shell/NuvPropPage/stdafx.cpp
trunk/MythTVReader/Shell/NuvPropPage/stdafx.h
trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.cpp
trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.h
trunk/MythTVReader/Shell/PropertyHandler/MythTVProperties.rgs
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.cpp
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.def
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.idl
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.rc
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.rgs
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandler.vcproj
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandlerPS.vcproj
trunk/MythTVReader/Shell/PropertyHandler/PropertyHandlerps.def
trunk/MythTVReader/Shell/PropertyHandler/resource.h
trunk/MythTVReader/Shell/PropertyHandler/stdafx.cpp
trunk/MythTVReader/Shell/PropertyHandler/stdafx.h
Modified: trunk/MythTVReader/MythTVReader.sln
===================================================================
--- trunk/MythTVReader/MythTVReader.sln 2007-07-15 12:26:46 UTC (rev 549)
+++ trunk/MythTVReader/MythTVReader.sln 2007-07-15 12:35:40 UTC (rev 550)
@@ -2,22 +2,22 @@
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSMyth", "DSMyth\DSMyth.vcproj", "{F6B27C5D-7691-4815-81A0-0C224E72398B}"
ProjectSection(ProjectDependencies) = postProject
+ {8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {8A693FB2-FAA6-407B-80C7-08C5C48C5381}
{5F161F3E-2B8B-4C77-8572-41007C10A02A} = {5F161F3E-2B8B-4C77-8572-41007C10A02A}
- {8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {8A693FB2-FAA6-407B-80C7-08C5C48C5381}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtjpg", "rtjpg\rtjpg.vcproj", "{D5CC2DA7-33FD-4ACD-B0ED-E32418612331}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NuvPropPage", "NuvPropPage\NuvPropPage.vcproj", "{A25C39EC-460F-4992-A46A-A8E07F47F98B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NuvPropPage", "Shell\NuvPropPage\NuvPropPage.vcproj", "{A25C39EC-460F-4992-A46A-A8E07F47F98B}"
ProjectSection(ProjectDependencies) = postProject
{8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {8A693FB2-FAA6-407B-80C7-08C5C48C5381}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MythSource", "MythSource\MythSource.vcproj", "{5F161F3E-2B8B-4C77-8572-41007C10A02A}"
ProjectSection(ProjectDependencies) = postProject
+ {8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {8A693FB2-FAA6-407B-80C7-08C5C48C5381}
+ {4E805F8C-4927-43D8-B6E4-C8F82AF670C3} = {4E805F8C-4927-43D8-B6E4-C8F82AF670C3}
{366D3D7C-DEED-4F5E-B506-3B235AB0B75C} = {366D3D7C-DEED-4F5E-B506-3B235AB0B75C}
- {4E805F8C-4927-43D8-B6E4-C8F82AF670C3} = {4E805F8C-4927-43D8-B6E4-C8F82AF670C3}
- {8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {8A693FB2-FAA6-407B-80C7-08C5C48C5381}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Config", "Config\Config.vcproj", "{4F964E4A-B778-4173-94A6-EAC25FD43885}"
@@ -37,12 +37,12 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdvbpsi", "libs\libdvbpsi\vc++\libdvbpsi.vcproj", "{4E805F8C-4927-43D8-B6E4-C8F82AF670C3}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PropertyHandler", "PropertyHandler\PropertyHandler.vcproj", "{B71EB910-12E4-4C96-B0C2-5284188F2C9D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PropertyHandler", "Shell\PropertyHandler\PropertyHandler.vcproj", "{B71EB910-12E4-4C96-B0C2-5284188F2C9D}"
ProjectSection(ProjectDependencies) = postProject
{8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {8A693FB2-FAA6-407B-80C7-08C5C48C5381}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PropertyHandlerPS", "PropertyHandler\PropertyHandlerPS.vcproj", "{F65AED6A-743C-4E23-A6B3-C17F4A19196B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PropertyHandlerPS", "Shell\PropertyHandler\PropertyHandlerPS.vcproj", "{F65AED6A-743C-4E23-A6B3-C17F4A19196B}"
ProjectSection(ProjectDependencies) = postProject
{B71EB910-12E4-4C96-B0C2-5284188F2C9D} = {B71EB910-12E4-4C96-B0C2-5284188F2C9D}
EndProjectSection
Copied: trunk/MythTVReader/Shell/NuvPropPage (from rev 545, trunk/MythTVReader/NuvPropPage)
Deleted: trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.cpp
===================================================================
--- trunk/MythTVReader/NuvPropPage/NuvColHandler.cpp 2007-07-12 16:19:58 UTC (rev 545)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.cpp 2007-07-15 12:35:40 UTC (rev 550)
@@ -1,258 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// $Id$
-/////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2003 Torbj\xF6rn Jansson. All rights reserved.
-/////////////////////////////////////////////////////////////////////////////
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-/////////////////////////////////////////////////////////////////////////////
-
-/**
- * @file NuvColHandler.cpp Implementation of CNuvColHandler
- */
-
-#include "stdafx.h"
-#include "NuvColHandler.h"
-#include "custprops.h"
-
-// CNuvColHandler
-CNuvColHandler::CNuvColHandler()
-{
-
-}
-
-HRESULT CNuvColHandler::FinalConstruct()
-{
- ATLTRACE(_T("%s(%d) : CNuvProps::FinalConstruct\n"),__FILE__,__LINE__);
- return S_OK;
-}
-
-void CNuvColHandler::FinalRelease()
-{
- ATLTRACE(_T("%s(%d) : CNuvProps::FinalRelease\n"),__FILE__,__LINE__);
-}
-
-HRESULT CNuvColHandler::Initialize(LPCSHCOLUMNINIT psci)
-{
- ATLTRACE(_T("%s(%d) : CNuvProps::Initialize\n"),__FILE__,__LINE__);
- m_Folder=psci->wszFolder;
- //clear cache when changing folder
- //probably not necessary
- //m_FileInfo.ClearCache();
- return S_OK;
-}
-
-HRESULT CNuvColHandler::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
-{
- ATLTRACE(_T("%s(%d) : CNuvProps::GetColumnInfo\n"),__FILE__,__LINE__);
- if(psci==NULL)
- {
- return E_POINTER;
- }
- if(dwIndex==0)
- {
- psci->scid.fmtid=FMTID_SummaryInformation;
- psci->scid.pid=PIDSI_TITLE;
- psci->vt=VT_BSTR;
- psci->cChars=15;
- psci->csFlags=SHCOLSTATE_TYPE_STR;
- lstrcpyW(psci->wszTitle,L"Title");
- lstrcpyW(psci->wszDescription,L"");
- return S_OK;
- }
- else if(dwIndex==1)
- {
- psci->scid.fmtid=FMTID_ImageSummaryInformation;
- psci->scid.pid=0xd;
- psci->vt=VT_BSTR;
- psci->cChars=10;
- psci->csFlags=SHCOLSTATE_TYPE_STR;
- lstrcpyW(psci->wszTitle,L"Dimensions");
- lstrcpyW(psci->wszDescription,L"");
- return S_OK;
- }
- else if(dwIndex==2)
- {
- psci->scid.fmtid=FMTID_AudioSummaryInformation;
- psci->scid.pid=PIDASI_TIMELENGTH;
- psci->vt=VT_LPWSTR;
- psci->cChars=15;
- psci->csFlags=SHCOLSTATE_TYPE_STR;
- lstrcpyW(psci->wszTitle,L"Duration");
- lstrcpyW(psci->wszDescription,L"");
- return S_OK;
- }
- else if(dwIndex==3)
- {
- psci->scid.fmtid=FMTID_DocSummaryInformation;
- psci->scid.pid=PIDDSI_CATEGORY;
- psci->vt=VT_LPWSTR;
- psci->cChars=20;
- psci->csFlags=SHCOLSTATE_TYPE_STR;
- lstrcpyW(psci->wszTitle,L"Category");
- lstrcpyW(psci->wszDescription,L"");
- return S_OK;
- }
- else if(dwIndex==4)
- {
- psci->scid.fmtid=FMTID_MythTVInformation;
- psci->scid.pid=PIDMT_CHANNEL;
- psci->vt=VT_LPWSTR;
- psci->cChars=20;
- psci->csFlags=SHCOLSTATE_TYPE_STR;
- lstrcpyW(psci->wszTitle,L"Channel");
- lstrcpyW(psci->wszDescription,L"Displays the name of the channel the file was recorded on");
- return S_OK;
- }
- else if(dwIndex==5)
- {
- psci->scid.fmtid=FMTID_MythTVInformation;
- psci->scid.pid=PIDMT_SUBTITLE;
- psci->vt=VT_LPWSTR;
- psci->cChars=20;
- psci->csFlags=SHCOLSTATE_TYPE_STR;
- lstrcpyW(psci->wszTitle,L"Subtitle");
- lstrcpyW(psci->wszDescription,L"");
- return S_OK;
- }
- else if(dwIndex==6)
- {
- psci->scid.fmtid=FMTID_MythTVInformation;
- psci->scid.pid=PIDMT_DESCRIPTION;
- psci->vt=VT_LPWSTR;
- psci->cChars=20;
- psci->csFlags=SHCOLSTATE_TYPE_STR;
- lstrcpyW(psci->wszTitle,L"Description");
- lstrcpyW(psci->wszDescription,L"");
- return S_OK;
- }
- else if(dwIndex==7)
- {
- psci->scid.fmtid=FMTID_MythTVInformation;
- psci->scid.pid=PIDMT_RECGROUP;
- psci->vt=VT_LPWSTR;
- psci->cChars=20;
- psci->csFlags=SHCOLSTATE_TYPE_STR;
- lstrcpyW(psci->wszTitle,L"Recording group");
- lstrcpyW(psci->wszDescription,L"");
- return S_OK;
- }
- else
- {
- return S_FALSE;
- }
-}
-
-HRESULT CNuvColHandler::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData)
-{
- ATLTRACE(_T("%s(%d) : CNuvProps::GetItemData\n"),__FILE__,__LINE__);
- //only process .nuv and .mpg files
- if(CAtlString(CW2A(pscd->pwszExt)).Right(4)!=".nuv" &&
- CAtlString(CW2A(pscd->pwszExt)).Right(4)!=".mpg")
- {
- return S_FALSE;
- }
-
- CAtlString ErrMsg;
- CNuvInfo::CFileInfo info;
- m_FileInfo.GetInfo(CAtlString(pscd->wszFile),info,pscd->dwFlags&SHCDF_UPDATEITEM);
-
- if(!info.m_bProgramInfoLoaded && !info.m_bFileInfoLoaded)
- {
- return S_FALSE;
- }
- if(info.m_bProgramInfoLoaded)
- {
- if(pscid->fmtid==FMTID_SummaryInformation)
- {
- if(pscid->pid==PIDSI_TITLE)
- {
- CComVariant var;
- var=CComBSTR(info.m_ProgramInfo.m_title);
- var.Detach(pvarData);
- return S_OK;
- }
- }
- else if(pscid->fmtid==FMTID_DocSummaryInformation)
- {
- if(pscid->pid==PIDDSI_CATEGORY)
- {
- CComVariant var;
- var=CComBSTR(info.m_ProgramInfo.m_category);
- var.Detach(pvarData);
- return S_OK;
- }
- }
- else if(pscid->fmtid==FMTID_MythTVInformation)
- {
- if(pscid->pid==PIDMT_CHANNEL)
- {
- CComVariant var;
- var=CComBSTR(info.m_ProgramInfo.m_channame);
- var.Detach(pvarData);
- return S_OK;
- }
- else if(pscid->pid==PIDMT_SUBTITLE)
- {
- CComVariant var;
- var=CComBSTR(info.m_ProgramInfo.m_subtitle);
- var.Detach(pvarData);
- return S_OK;
- }
- else if(pscid->pid==PIDMT_DESCRIPTION)
- {
- CComVariant var;
- var=CComBSTR(info.m_ProgramInfo.m_description);
- var.Detach(pvarData);
- return S_OK;
- }
- else if(pscid->pid==PIDMT_RECGROUP)
- {
- CComVariant var;
- var=CComBSTR(info.m_ProgramInfo.m_recgroup);
- var.Detach(pvarData);
- return S_OK;
- }
- }
- }
-
- if(info.m_bFileInfoLoaded)
- {
- if(pscid->fmtid==FMTID_ImageSummaryInformation)
- {
- if(pscid->pid==0xd)
- {
- CComVariant var;
- CAtlString tmp;
- tmp.Format(_T("%d x %d"),info.m_rtFileHeader.width,info.m_rtFileHeader.height);
- var=tmp;
- var.Detach(pvarData);
- return S_OK;
- }
- }
- else if(pscid->fmtid==FMTID_AudioSummaryInformation)
- {
- if(pscid->pid==PIDASI_TIMELENGTH)
- {
- if(info.m_bUsingExtendedData && info.m_bHasLength)
- {
- pvarData->vt=VT_UI8;
- pvarData->ullVal=(ULONGLONG)info.m_TotalLength*10000000;
- return S_OK;
- }
- }
- }
- }
- return S_FALSE;
-}
Copied: trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.cpp (from rev 549, trunk/MythTVReader/NuvPropPage/NuvColHandler.cpp)
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.cpp (rev 0)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.cpp 2007-07-15 12:35:40 UTC (rev 550)
@@ -0,0 +1,258 @@
+/////////////////////////////////////////////////////////////////////////////
+// $Id$
+/////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2003 Torbj\xF6rn Jansson. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+ * @file NuvColHandler.cpp Implementation of CNuvColHandler
+ */
+
+#include "stdafx.h"
+#include "NuvColHandler.h"
+#include "custprops.h"
+
+// CNuvColHandler
+CNuvColHandler::CNuvColHandler()
+{
+
+}
+
+HRESULT CNuvColHandler::FinalConstruct()
+{
+ ATLTRACE(_T("%s(%d) : CNuvProps::FinalConstruct\n"),__FILE__,__LINE__);
+ return S_OK;
+}
+
+void CNuvColHandler::FinalRelease()
+{
+ ATLTRACE(_T("%s(%d) : CNuvProps::FinalRelease\n"),__FILE__,__LINE__);
+}
+
+HRESULT CNuvColHandler::Initialize(LPCSHCOLUMNINIT psci)
+{
+ ATLTRACE(_T("%s(%d) : CNuvProps::Initialize\n"),__FILE__,__LINE__);
+ m_Folder=psci->wszFolder;
+ //clear cache when changing folder
+ //probably not necessary
+ //m_FileInfo.ClearCache();
+ return S_OK;
+}
+
+HRESULT CNuvColHandler::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
+{
+ ATLTRACE(_T("%s(%d) : CNuvProps::GetColumnInfo\n"),__FILE__,__LINE__);
+ if(psci==NULL)
+ {
+ return E_POINTER;
+ }
+ if(dwIndex==0)
+ {
+ psci->scid.fmtid=FMTID_SummaryInformation;
+ psci->scid.pid=PIDSI_TITLE;
+ psci->vt=VT_BSTR;
+ psci->cChars=15;
+ psci->csFlags=SHCOLSTATE_TYPE_STR;
+ lstrcpyW(psci->wszTitle,L"Title");
+ lstrcpyW(psci->wszDescription,L"");
+ return S_OK;
+ }
+ else if(dwIndex==1)
+ {
+ psci->scid.fmtid=FMTID_ImageSummaryInformation;
+ psci->scid.pid=0xd;
+ psci->vt=VT_BSTR;
+ psci->cChars=10;
+ psci->csFlags=SHCOLSTATE_TYPE_STR;
+ lstrcpyW(psci->wszTitle,L"Dimensions");
+ lstrcpyW(psci->wszDescription,L"");
+ return S_OK;
+ }
+ else if(dwIndex==2)
+ {
+ psci->scid.fmtid=FMTID_AudioSummaryInformation;
+ psci->scid.pid=PIDASI_TIMELENGTH;
+ psci->vt=VT_LPWSTR;
+ psci->cChars=15;
+ psci->csFlags=SHCOLSTATE_TYPE_STR;
+ lstrcpyW(psci->wszTitle,L"Duration");
+ lstrcpyW(psci->wszDescription,L"");
+ return S_OK;
+ }
+ else if(dwIndex==3)
+ {
+ psci->scid.fmtid=FMTID_DocSummaryInformation;
+ psci->scid.pid=PIDDSI_CATEGORY;
+ psci->vt=VT_LPWSTR;
+ psci->cChars=20;
+ psci->csFlags=SHCOLSTATE_TYPE_STR;
+ lstrcpyW(psci->wszTitle,L"Category");
+ lstrcpyW(psci->wszDescription,L"");
+ return S_OK;
+ }
+ else if(dwIndex==4)
+ {
+ psci->scid.fmtid=FMTID_MythTVInformation;
+ psci->scid.pid=PIDMT_CHANNEL;
+ psci->vt=VT_LPWSTR;
+ psci->cChars=20;
+ psci->csFlags=SHCOLSTATE_TYPE_STR;
+ lstrcpyW(psci->wszTitle,L"Channel");
+ lstrcpyW(psci->wszDescription,L"Displays the name of the channel the file was recorded on");
+ return S_OK;
+ }
+ else if(dwIndex==5)
+ {
+ psci->scid.fmtid=FMTID_MythTVInformation;
+ psci->scid.pid=PIDMT_SUBTITLE;
+ psci->vt=VT_LPWSTR;
+ psci->cChars=20;
+ psci->csFlags=SHCOLSTATE_TYPE_STR;
+ lstrcpyW(psci->wszTitle,L"Subtitle");
+ lstrcpyW(psci->wszDescription,L"");
+ return S_OK;
+ }
+ else if(dwIndex==6)
+ {
+ psci->scid.fmtid=FMTID_MythTVInformation;
+ psci->scid.pid=PIDMT_DESCRIPTION;
+ psci->vt=VT_LPWSTR;
+ psci->cChars=20;
+ psci->csFlags=SHCOLSTATE_TYPE_STR;
+ lstrcpyW(psci->wszTitle,L"Description");
+ lstrcpyW(psci->wszDescription,L"");
+ return S_OK;
+ }
+ else if(dwIndex==7)
+ {
+ psci->scid.fmtid=FMTID_MythTVInformation;
+ psci->scid.pid=PIDMT_RECGROUP;
+ psci->vt=VT_LPWSTR;
+ psci->cChars=20;
+ psci->csFlags=SHCOLSTATE_TYPE_STR;
+ lstrcpyW(psci->wszTitle,L"Recording group");
+ lstrcpyW(psci->wszDescription,L"");
+ return S_OK;
+ }
+ else
+ {
+ return S_FALSE;
+ }
+}
+
+HRESULT CNuvColHandler::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData)
+{
+ ATLTRACE(_T("%s(%d) : CNuvProps::GetItemData\n"),__FILE__,__LINE__);
+ //only process .nuv and .mpg files
+ if(CAtlString(CW2A(pscd->pwszExt)).Right(4)!=".nuv" &&
+ CAtlString(CW2A(pscd->pwszExt)).Right(4)!=".mpg")
+ {
+ return S_FALSE;
+ }
+
+ CAtlString ErrMsg;
+ CNuvInfo::CFileInfo info;
+ m_FileInfo.GetInfo(CAtlString(pscd->wszFile),info,pscd->dwFlags&SHCDF_UPDATEITEM);
+
+ if(!info.m_bProgramInfoLoaded && !info.m_bFileInfoLoaded)
+ {
+ return S_FALSE;
+ }
+ if(info.m_bProgramInfoLoaded)
+ {
+ if(pscid->fmtid==FMTID_SummaryInformation)
+ {
+ if(pscid->pid==PIDSI_TITLE)
+ {
+ CComVariant var;
+ var=CComBSTR(info.m_ProgramInfo.m_title);
+ var.Detach(pvarData);
+ return S_OK;
+ }
+ }
+ else if(pscid->fmtid==FMTID_DocSummaryInformation)
+ {
+ if(pscid->pid==PIDDSI_CATEGORY)
+ {
+ CComVariant var;
+ var=CComBSTR(info.m_ProgramInfo.m_category);
+ var.Detach(pvarData);
+ return S_OK;
+ }
+ }
+ else if(pscid->fmtid==FMTID_MythTVInformation)
+ {
+ if(pscid->pid==PIDMT_CHANNEL)
+ {
+ CComVariant var;
+ var=CComBSTR(info.m_ProgramInfo.m_channame);
+ var.Detach(pvarData);
+ return S_OK;
+ }
+ else if(pscid->pid==PIDMT_SUBTITLE)
+ {
+ CComVariant var;
+ var=CComBSTR(info.m_ProgramInfo.m_subtitle);
+ var.Detach(pvarData);
+ return S_OK;
+ }
+ else if(pscid->pid==PIDMT_DESCRIPTION)
+ {
+ CComVariant var;
+ var=CComBSTR(info.m_ProgramInfo.m_description);
+ var.Detach(pvarData);
+ return S_OK;
+ }
+ else if(pscid->pid==PIDMT_RECGROUP)
+ {
+ CComVariant var;
+ var=CComBSTR(info.m_ProgramInfo.m_recgroup);
+ var.Detach(pvarData);
+ return S_OK;
+ }
+ }
+ }
+
+ if(info.m_bFileInfoLoaded)
+ {
+ if(pscid->fmtid==FMTID_ImageSummaryInformation)
+ {
+ if(pscid->pid==0xd)
+ {
+ CComVariant var;
+ CAtlString tmp;
+ tmp.Format(_T("%d x %d"),info.m_rtFileHeader.width,info.m_rtFileHeader.height);
+ var=tmp;
+ var.Detach(pvarData);
+ return S_OK;
+ }
+ }
+ else if(pscid->fmtid==FMTID_AudioSummaryInformation)
+ {
+ if(pscid->pid==PIDASI_TIMELENGTH)
+ {
+ if(info.m_bUsingExtendedData && info.m_bHasLength)
+ {
+ pvarData->vt=VT_UI8;
+ pvarData->ullVal=(ULONGLONG)info.m_TotalLength*10000000;
+ return S_OK;
+ }
+ }
+ }
+ }
+ return S_FALSE;
+}
Deleted: trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.h
===================================================================
--- trunk/MythTVReader/NuvPropPage/NuvColHandler.h 2007-07-12 16:19:58 UTC (rev 545)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.h 2007-07-15 12:35:40 UTC (rev 550)
@@ -1,70 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// $Id$
-/////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2003 Torbj\xF6rn Jansson. All rights reserved.
-/////////////////////////////////////////////////////////////////////////////
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-/////////////////////////////////////////////////////////////////////////////
-
-/**
- * @file NuvColHandler.h Declaration of the CNuvColHandler
- */
-
-#pragma once
-#include "resource.h" // main symbols
-
-#include "NuvPropPage.h"
-#include "..\common\NuvInfo.h"
-
-/**
- * A column extension handler.
- * This class add information from the nuv file and the mysql database to the
- * columns i explorer.
- * To be able to use the existing column headers the correct
- * propertyset format id and property id. The problem is that they are very badly
- * documented in the platform sdk, only the summary information property set is well documented.
- */
-class ATL_NO_VTABLE CNuvColHandler :
- public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CNuvColHandler, &CLSID_NuvColHandler>,
- public IColumnProvider
-{
-public:
- CNuvColHandler();
-
-DECLARE_REGISTRY_RESOURCEID(IDR_NUVCOLHANDLER)
-
-
-BEGIN_COM_MAP(CNuvColHandler)
- COM_INTERFACE_ENTRY_IID(IID_IColumnProvider,IColumnProvider)
-END_COM_MAP()
-
-
- DECLARE_PROTECT_FINAL_CONSTRUCT()
-
- HRESULT FinalConstruct();
- void FinalRelease();
-
-//IColumnProvider
- STDMETHOD(Initialize)(LPCSHCOLUMNINIT psci);
- STDMETHOD(GetColumnInfo)(DWORD dwIndex, SHCOLUMNINFO *psci);
- STDMETHOD(GetItemData)(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData);
-
-private:
- CNuvInfo m_FileInfo;
- CAtlStringW m_Folder;
-};
-
-OBJECT_ENTRY_AUTO(__uuidof(NuvColHandler), CNuvColHandler)
Copied: trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.h (from rev 549, trunk/MythTVReader/NuvPropPage/NuvColHandler.h)
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.h (rev 0)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.h 2007-07-15 12:35:40 UTC (rev 550)
@@ -0,0 +1,70 @@
+/////////////////////////////////////////////////////////////////////////////
+// $Id$
+/////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2003 Torbj\xF6rn Jansson. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+ * @file NuvColHandler.h Declaration of the CNuvColHandler
+ */
+
+#pragma once
+#include "resource.h" // main symbols
+
+#include "NuvPropPage.h"
+#include "..\common\NuvInfo.h"
+
+/**
+ * A column extension handler.
+ * This class add information from the nuv file and the mysql database to the
+ * columns i explorer.
+ * To be able to use the existing column headers the correct
+ * propertyset format id and property id. The problem is that they are very badly
+ * documented in the platform sdk, only the summary information property set is well documented.
+ */
+class ATL_NO_VTABLE CNuvColHandler :
+ public CComObjectRootEx<CComSingleThreadModel>,
+ public CComCoClass<CNuvColHandler, &CLSID_NuvColHandler>,
+ public IColumnProvider
+{
+public:
+ CNuvColHandler();
+
+DECLARE_REGISTRY_RESOURCEID(IDR_NUVCOLHANDLER)
+
+
+BEGIN_COM_MAP(CNuvColHandler)
+ COM_INTERFACE_ENTRY_IID(IID_IColumnProvider,IColumnProvider)
+END_COM_MAP()
+
+
+ DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+ HRESULT FinalConstruct();
+ void FinalRelease();
+
+//IColumnProvider
+ STDMETHOD(Initialize)(LPCSHCOLUMNINIT psci);
+ STDMETHOD(GetColumnInfo)(DWORD dwIndex, SHCOLUMNINFO *psci);
+ STDMETHOD(GetItemData)(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData);
+
+private:
+ CNuvInfo m_FileInfo;
+ CAtlStringW m_Folder;
+};
+
+OBJECT_ENTRY_AUTO(__uuidof(NuvColHandler), CNuvColHandler)
Deleted: trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.rgs
===================================================================
--- trunk/MythTVReader/NuvPropPage/NuvColHandler.rgs 2007-07-12 16:19:58 UTC (rev 545)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.rgs 2007-07-15 12:35:40 UTC (rev 550)
@@ -1,36 +0,0 @@
-HKCR
-{
- NuvPropPage.NuvColHandler.1 = s 'NuvColHandler Class'
- {
- CLSID = s '{86F08DD4-907C-4C94-8BBD-F70242A4883F}'
- }
- NuvPropPage.NuvColHandler = s 'NuvColHandler Class'
- {
- CLSID = s '{86F08DD4-907C-4C94-8BBD-F70242A4883F}'
- CurVer = s 'NuvPropPage.NuvColHandler.1'
- }
- NoRemove CLSID
- {
- ForceRemove {86F08DD4-907C-4C94-8BBD-F70242A4883F} = s 'NuvColHandler Class'
- {
- ProgID = s 'NuvPropPage.NuvColHandler.1'
- VersionIndependentProgID = s 'NuvPropPage.NuvColHandler'
- InprocServer32 = s '%MODULE%'
- {
- val ThreadingModel = s 'Apartment'
- }
- val AppID = s '%APPID%'
- 'TypeLib' = s '{A9983193-2815-4899-A4A1-1CBED6AD4655}'
- }
- }
- NoRemove Folder
- {
- NoRemove shellex
- {
- NoRemove ColumnHandlers
- {
- ForceRemove {86F08DD4-907C-4C94-8BBD-F70242A4883F}
- }
- }
- }
-}
Copied: trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.rgs (from rev 549, trunk/MythTVReader/NuvPropPage/NuvColHandler.rgs)
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.rgs (rev 0)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvColHandler.rgs 2007-07-15 12:35:40 UTC (rev 550)
@@ -0,0 +1,36 @@
+HKCR
+{
+ NuvPropPage.NuvColHandler.1 = s 'NuvColHandler Class'
+ {
+ CLSID = s '{86F08DD4-907C-4C94-8BBD-F70242A4883F}'
+ }
+ NuvPropPage.NuvColHandler = s 'NuvColHandler Class'
+ {
+ CLSID = s '{86F08DD4-907C-4C94-8BBD-F70242A4883F}'
+ CurVer = s 'NuvPropPage.NuvColHandler.1'
+ }
+ NoRemove CLSID
+ {
+ ForceRemove {86F08DD4-907C-4C94-8BBD-F70242A4883F} = s 'NuvColHandler Class'
+ {
+ ProgID = s 'NuvPropPage.NuvColHandler.1'
+ VersionIndependentProgID = s 'NuvPropPage.NuvColHandler'
+ InprocServer32 = s '%MODULE%'
+ {
+ val ThreadingModel = s 'Apartment'
+ }
+ val AppID = s '%APPID%'
+ 'TypeLib' = s '{A9983193-2815-4899-A4A1-1CBED6AD4655}'
+ }
+ }
+ NoRemove Folder
+ {
+ NoRemove shellex
+ {
+ NoRemove ColumnHandlers
+ {
+ ForceRemove {86F08DD4-907C-4C94-8BBD-F70242A4883F}
+ }
+ }
+ }
+}
Deleted: trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.cpp
===================================================================
--- trunk/MythTVReader/NuvPropPage/NuvDBProps.cpp 2007-07-12 16:19:58 UTC (rev 545)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.cpp 2007-07-15 12:35:40 UTC (rev 550)
@@ -1,244 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// $Id$
-/////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2003 Torbj\xF6rn Jansson. All rights reserved.
-/////////////////////////////////////////////////////////////////////////////
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-/////////////////////////////////////////////////////////////////////////////
-
-/**
- * @file NuvDBProps.cpp Implementation of CNuvDBProps
- */
-
-#include "stdafx.h"
-#include "NuvDBProps.h"
-#include "DBUtils.h"
-
-// CNuvDBProps
-CNuvDBProps::CNuvDBProps()
-:m_bMultipleFiles(false),m_hRegKey(NULL)
-{
-
-}
-
-HRESULT CNuvDBProps::FinalConstruct()
-{
- ATLTRACE(_T("%s(%d) : CNuvDBProps::FinalConstruct\n"),__FILE__,__LINE__);
- return S_OK;
-}
-
-void CNuvDBProps::FinalRelease()
-{
- ATLTRACE(_T("%s(%d) : CNuvDBProps::FinalRelease\n"),__FILE__,__LINE__);
- RegCloseKey(m_hRegKey);
- m_hRegKey=NULL;
-}
-
-HRESULT CNuvDBProps::Initialize(LPCITEMIDLIST pIDFolder,IDataObject *pDataObj,HKEY hkeyProgID)
-{
- ATLTRACE(_T("%s(%d) : CNuvDBProps::Initialize\n"),__FILE__,__LINE__);
- //Store the PIDL.
- if(pIDFolder)
- {
- m_pIDFolder=pIDFolder;
- }
-
- // If Initialize has already been called, release the old
- // IDataObject pointer.
- if(m_pDataObj)
- {
- m_pDataObj=NULL;
- }
-
- // If a data object pointer was passed in, save it and
- // extract the file name.
- if(pDataObj)
- {
- m_pDataObj=pDataObj;
-
- STGMEDIUM medium;
- FORMATETC fe={CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
- UINT uCount;
-
- if(SUCCEEDED(m_pDataObj->GetData(&fe, &medium)))
- {
- // Get the count of files dropped.
- uCount=DragQueryFile((HDROP)medium.hGlobal, (UINT)-1, NULL, 0);
- if(uCount>1)
- {
- m_bMultipleFiles=true;
- }
-
- // Get the first file name from the CF_HDROP.
- if(uCount)
- {
- DragQueryFile((HDROP)medium.hGlobal, 0, m_szFile,sizeof(m_szFile)/sizeof(TCHAR));
- }
-
- ReleaseStgMedium(&medium);
- }
- }
-
- // Duplicate the registry handle.
- if(hkeyProgID)
- {
- RegOpenKeyEx(hkeyProgID,NULL,0L,MAXIMUM_ALLOWED,&m_hRegKey);
- }
- return S_OK;
-}
-
-HRESULT CNuvDBProps::AddPages(LPFNSVADDPROPSHEETPAGE pfnAddPage,LPARAM lParam)
-{
- ATLTRACE(_T("%s(%d) : CNuvDBProps::AddPages\n"),__FILE__,__LINE__);
- //can only handle one file at a time
- if(m_bMultipleFiles)
- {
- return E_FAIL;
- }
-
- PROPSHEETPAGE psp;
- HPROPSHEETPAGE hPage;
-
- psp.dwSize=sizeof(psp);
- psp.dwFlags=PSP_USECALLBACK;
- psp.hInstance=g_hInst;
- psp.pszTemplate=MAKEINTRESOURCE(IDD_DBINFO);
- psp.hIcon=0;
- psp.pfnDlgProc=DlgProc;
- psp.pfnCallback=PropSheetPageProc;
- psp.lParam=(LPARAM)this;
-
- hPage=CreatePropertySheetPage(&psp);
-
- if(hPage)
- {
- if(pfnAddPage(hPage,lParam))
- {
- this->AddRef();
- return S_OK;
- }
- else
- {
- DestroyPropertySheetPage(hPage);
- }
- }
- else
- {
- return E_OUTOFMEMORY;
- }
- return E_FAIL;
-}
-
-HRESULT CNuvDBProps::ReplacePage(EXPPS uPageID,LPFNSVADDPROPSHEETPAGE pfnReplaceWith,LPARAM lParam)
-{
- ATLTRACE(_T("%s(%d) : CNuvDBProps::ReplacePage\n"),__FILE__,__LINE__);
- return E_NOTIMPL;
-}
-
-UINT CNuvDBProps::PropSheetPageProc(HWND hwnd,UINT uMsg,LPPROPSHEETPAGE ppsp)
-{
- ATLTRACE(_T("%s(%d) : CNuvDBProps::PropSheetPageProc\n"),__FILE__,__LINE__);
- return ((CNuvDBProps*)ppsp->lParam)->PageProc(hwnd,uMsg,ppsp);
-}
-
-UINT CNuvDBProps::PageProc(HWND hwnd,UINT uMsg,LPPROPSHEETPAGE ppsp)
-{
- switch(uMsg)
- {
- case PSPCB_CREATE:
- return 1;
- break;
- case PSPCB_RELEASE:
- this->Release();
- break;
- }
- return 0;
-}
-
-INT_PTR CNuvDBProps::DlgProc(HWND hDlg,UINT uMessage,WPARAM wParam,LPARAM lParam)
-{
- ATLTRACE(_T("%s(%d) : CNuvDBProps::PropSheetPageProc\n"),__FILE__,__LINE__);
- static CNuvDBProps* pThis=NULL;
- if(uMessage==WM_INITDIALOG)
- {
- pThis=(CNuvDBProps*)((LPPROPSHEETPAGE)lParam)->lParam;
- }
- if(pThis!=NULL)
- {
- return pThis->NuvPageDlgProc(hDlg,uMessage,wParam,lParam);
- }
- else
- {
- return FALSE;
- }
-}
-
-INT_PTR CNuvDBProps::NuvPageDlgProc(HWND hDlg,UINT uMessage,WPARAM wParam,LPARAM lParam)
-{
- switch(uMessage)
- {
- case WM_INITDIALOG:
- UpdateDialog(hDlg);
- return TRUE;
- break;
- }
- return FALSE;
-}
-
-void CNuvDBProps::UpdateDialog(HWND hDlg)
-{
- SetDlgItemText(hDlg,IDC_DBINFO_TITLE,"");
- SetDlgItemText(hDlg,IDC_DBINFO_SUBTITLE,"");
- SetDlgItemText(hDlg,IDC_DBINFO_CATEGORY,"");
- SetDlgItemText(hDlg,IDC_DBINFO_STARTTIME,"");
- SetDlgItemText(hDlg,IDC_DBINFO_LENGTH,"");
- SetDlgItemText(hDlg,IDC_DBINFO_DESCRIPTION,"");
- SetDlgItemText(hDlg,IDC_DBINFO_CHANNEL,"");
-
- CDBUtils dbutil;
- if(!dbutil.IsMysqlEnabled())
- {
- SetDlgItemText(hDlg,IDC_DBINFO_STATUS,"MySQL support is not enabled. Use configuration program to enable it");
- return;
- }
-
- CAtlString ErrorMsg;
- CNuvInfo::CFileInfo info;
- m_FileInfo.GetInfo(m_szFile,info);
- if(!info.m_bProgramInfoLoaded)
- {
- //show error
- SetDlgItemText(hDlg,IDC_DBINFO_STATUS,info.m_ProgramInfoErrorMsg);
- return;
- }
-
- CAtlString oldlocale=setlocale(LC_ALL,NULL);
- setlocale(LC_ALL,"");
-
- SetDlgItemText(hDlg,IDC_DBINFO_STATUS,info.m_ProgramInfoErrorMsg);
-
- SetDlgItemText(hDlg,IDC_DBINFO_TITLE,CW2A(info.m_ProgramInfo.m_title.GetBuffer()));
- SetDlgItemText(hDlg,IDC_DBINFO_SUBTITLE,CW2A(info.m_ProgramInfo.m_subtitle.GetBuffer()));
- SetDlgItemText(hDlg,IDC_DBINFO_CATEGORY,CW2A(info.m_ProgramInfo.m_category.GetBuffer()));
- SetDlgItemText(hDlg,IDC_DBINFO_STARTTIME,(LPCSTR)info.m_ProgramInfo.m_recstartts.Format("%c"));
-
- CTimeSpan length=info.m_ProgramInfo.m_recendts-info.m_ProgramInfo.m_recstartts;
- CAtlString format=length.GetDays()>0 ? "%D %H:%M:%S" : "%H:%M:%S";
- SetDlgItemText(hDlg,IDC_DBINFO_LENGTH,(LPCSTR)length.Format(format));
- SetDlgItemText(hDlg,IDC_DBINFO_DESCRIPTION,CW2A(info.m_ProgramInfo.m_description.GetBuffer()));
- SetDlgItemText(hDlg,IDC_DBINFO_CHANNEL,CW2A(info.m_ProgramInfo.m_channame.GetBuffer()));
-
- setlocale(LC_ALL,oldlocale);
-}
\ No newline at end of file
Copied: trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.cpp (from rev 549, trunk/MythTVReader/NuvPropPage/NuvDBProps.cpp)
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.cpp (rev 0)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.cpp 2007-07-15 12:35:40 UTC (rev 550)
@@ -0,0 +1,244 @@
+/////////////////////////////////////////////////////////////////////////////
+// $Id$
+/////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2003 Torbj\xF6rn Jansson. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+ * @file NuvDBProps.cpp Implementation of CNuvDBProps
+ */
+
+#include "stdafx.h"
+#include "NuvDBProps.h"
+#include "DBUtils.h"
+
+// CNuvDBProps
+CNuvDBProps::CNuvDBProps()
+:m_bMultipleFiles(false),m_hRegKey(NULL)
+{
+
+}
+
+HRESULT CNuvDBProps::FinalConstruct()
+{
+ ATLTRACE(_T("%s(%d) : CNuvDBProps::FinalConstruct\n"),__FILE__,__LINE__);
+ return S_OK;
+}
+
+void CNuvDBProps::FinalRelease()
+{
+ ATLTRACE(_T("%s(%d) : CNuvDBProps::FinalRelease\n"),__FILE__,__LINE__);
+ RegCloseKey(m_hRegKey);
+ m_hRegKey=NULL;
+}
+
+HRESULT CNuvDBProps::Initialize(LPCITEMIDLIST pIDFolder,IDataObject *pDataObj,HKEY hkeyProgID)
+{
+ ATLTRACE(_T("%s(%d) : CNuvDBProps::Initialize\n"),__FILE__,__LINE__);
+ //Store the PIDL.
+ if(pIDFolder)
+ {
+ m_pIDFolder=pIDFolder;
+ }
+
+ // If Initialize has already been called, release the old
+ // IDataObject pointer.
+ if(m_pDataObj)
+ {
+ m_pDataObj=NULL;
+ }
+
+ // If a data object pointer was passed in, save it and
+ // extract the file name.
+ if(pDataObj)
+ {
+ m_pDataObj=pDataObj;
+
+ STGMEDIUM medium;
+ FORMATETC fe={CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
+ UINT uCount;
+
+ if(SUCCEEDED(m_pDataObj->GetData(&fe, &medium)))
+ {
+ // Get the count of files dropped.
+ uCount=DragQueryFile((HDROP)medium.hGlobal, (UINT)-1, NULL, 0);
+ if(uCount>1)
+ {
+ m_bMultipleFiles=true;
+ }
+
+ // Get the first file name from the CF_HDROP.
+ if(uCount)
+ {
+ DragQueryFile((HDROP)medium.hGlobal, 0, m_szFile,sizeof(m_szFile)/sizeof(TCHAR));
+ }
+
+ ReleaseStgMedium(&medium);
+ }
+ }
+
+ // Duplicate the registry handle.
+ if(hkeyProgID)
+ {
+ RegOpenKeyEx(hkeyProgID,NULL,0L,MAXIMUM_ALLOWED,&m_hRegKey);
+ }
+ return S_OK;
+}
+
+HRESULT CNuvDBProps::AddPages(LPFNSVADDPROPSHEETPAGE pfnAddPage,LPARAM lParam)
+{
+ ATLTRACE(_T("%s(%d) : CNuvDBProps::AddPages\n"),__FILE__,__LINE__);
+ //can only handle one file at a time
+ if(m_bMultipleFiles)
+ {
+ return E_FAIL;
+ }
+
+ PROPSHEETPAGE psp;
+ HPROPSHEETPAGE hPage;
+
+ psp.dwSize=sizeof(psp);
+ psp.dwFlags=PSP_USECALLBACK;
+ psp.hInstance=g_hInst;
+ psp.pszTemplate=MAKEINTRESOURCE(IDD_DBINFO);
+ psp.hIcon=0;
+ psp.pfnDlgProc=DlgProc;
+ psp.pfnCallback=PropSheetPageProc;
+ psp.lParam=(LPARAM)this;
+
+ hPage=CreatePropertySheetPage(&psp);
+
+ if(hPage)
+ {
+ if(pfnAddPage(hPage,lParam))
+ {
+ this->AddRef();
+ return S_OK;
+ }
+ else
+ {
+ DestroyPropertySheetPage(hPage);
+ }
+ }
+ else
+ {
+ return E_OUTOFMEMORY;
+ }
+ return E_FAIL;
+}
+
+HRESULT CNuvDBProps::ReplacePage(EXPPS uPageID,LPFNSVADDPROPSHEETPAGE pfnReplaceWith,LPARAM lParam)
+{
+ ATLTRACE(_T("%s(%d) : CNuvDBProps::ReplacePage\n"),__FILE__,__LINE__);
+ return E_NOTIMPL;
+}
+
+UINT CNuvDBProps::PropSheetPageProc(HWND hwnd,UINT uMsg,LPPROPSHEETPAGE ppsp)
+{
+ ATLTRACE(_T("%s(%d) : CNuvDBProps::PropSheetPageProc\n"),__FILE__,__LINE__);
+ return ((CNuvDBProps*)ppsp->lParam)->PageProc(hwnd,uMsg,ppsp);
+}
+
+UINT CNuvDBProps::PageProc(HWND hwnd,UINT uMsg,LPPROPSHEETPAGE ppsp)
+{
+ switch(uMsg)
+ {
+ case PSPCB_CREATE:
+ return 1;
+ break;
+ case PSPCB_RELEASE:
+ this->Release();
+ break;
+ }
+ return 0;
+}
+
+INT_PTR CNuvDBProps::DlgProc(HWND hDlg,UINT uMessage,WPARAM wParam,LPARAM lParam)
+{
+ ATLTRACE(_T("%s(%d) : CNuvDBProps::PropSheetPageProc\n"),__FILE__,__LINE__);
+ static CNuvDBProps* pThis=NULL;
+ if(uMessage==WM_INITDIALOG)
+ {
+ pThis=(CNuvDBProps*)((LPPROPSHEETPAGE)lParam)->lParam;
+ }
+ if(pThis!=NULL)
+ {
+ return pThis->NuvPageDlgProc(hDlg,uMessage,wParam,lParam);
+ }
+ else
+ {
+ return FALSE;
+ }
+}
+
+INT_PTR CNuvDBProps::NuvPageDlgProc(HWND hDlg,UINT uMessage,WPARAM wParam,LPARAM lParam)
+{
+ switch(uMessage)
+ {
+ case WM_INITDIALOG:
+ UpdateDialog(hDlg);
+ return TRUE;
+ break;
+ }
+ return FALSE;
+}
+
+void CNuvDBProps::UpdateDialog(HWND hDlg)
+{
+ SetDlgItemText(hDlg,IDC_DBINFO_TITLE,"");
+ SetDlgItemText(hDlg,IDC_DBINFO_SUBTITLE,"");
+ SetDlgItemText(hDlg,IDC_DBINFO_CATEGORY,"");
+ SetDlgItemText(hDlg,IDC_DBINFO_STARTTIME,"");
+ SetDlgItemText(hDlg,IDC_DBINFO_LENGTH,"");
+ SetDlgItemText(hDlg,IDC_DBINFO_DESCRIPTION,"");
+ SetDlgItemText(hDlg,IDC_DBINFO_CHANNEL,"");
+
+ CDBUtils dbutil;
+ if(!dbutil.IsMysqlEnabled())
+ {
+ SetDlgItemText(hDlg,IDC_DBINFO_STATUS,"MySQL support is not enabled. Use configuration program to enable it");
+ return;
+ }
+
+ CAtlString ErrorMsg;
+ CNuvInfo::CFileInfo info;
+ m_FileInfo.GetInfo(m_szFile,info);
+ if(!info.m_bProgramInfoLoaded)
+ {
+ //show error
+ SetDlgItemText(hDlg,IDC_DBINFO_STATUS,info.m_ProgramInfoErrorMsg);
+ return;
+ }
+
+ CAtlString oldlocale=setlocale(LC_ALL,NULL);
+ setlocale(LC_ALL,"");
+
+ SetDlgItemText(hDlg,IDC_DBINFO_STATUS,info.m_ProgramInfoErrorMsg);
+
+ SetDlgItemText(hDlg,IDC_DBINFO_TITLE,CW2A(info.m_ProgramInfo.m_title.GetBuffer()));
+ SetDlgItemText(hDlg,IDC_DBINFO_SUBTITLE,CW2A(info.m_ProgramInfo.m_subtitle.GetBuffer()));
+ SetDlgItemText(hDlg,IDC_DBINFO_CATEGORY,CW2A(info.m_ProgramInfo.m_category.GetBuffer()));
+ SetDlgItemText(hDlg,IDC_DBINFO_STARTTIME,(LPCSTR)info.m_ProgramInfo.m_startts.Format("%c"));
+
+ CTimeSpan length=info.m_ProgramInfo.m_endts-info.m_ProgramInfo.m_startts;
+ CAtlString format=length.GetDays()>0 ? "%D %H:%M:%S" : "%H:%M:%S";
+ SetDlgItemText(hDlg,IDC_DBINFO_LENGTH,(LPCSTR)length.Format(format));
+ SetDlgItemText(hDlg,IDC_DBINFO_DESCRIPTION,CW2A(info.m_ProgramInfo.m_description.GetBuffer()));
+ SetDlgItemText(hDlg,IDC_DBINFO_CHANNEL,CW2A(info.m_ProgramInfo.m_channame.GetBuffer()));
+
+ setlocale(LC_ALL,oldlocale);
+}
\ No newline at end of file
Deleted: trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.h
===================================================================
--- trunk/MythTVReader/NuvPropPage/NuvDBProps.h 2007-07-12 16:19:58 UTC (rev 545)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.h 2007-07-15 12:35:40 UTC (rev 550)
@@ -1,83 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// $Id$
-/////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2003 Torbj\xF6rn Jansson. All rights reserved.
-/////////////////////////////////////////////////////////////////////////////
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-/////////////////////////////////////////////////////////////////////////////
-
-/**
- * @file NuvDBProps.h Declaration of the CNuvDBProps
- */
-
-#pragma once
-#include "resource.h" // main symbols
-
-#include "NuvPropPage.h"
-#include "NuvInfo.h"
-
-extern HINSTANCE g_hInst;
-
-// CNuvDBProps
-
-class ATL_NO_VTABLE CNuvDBProps :
- public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CNuvDBProps, &CLSID_NuvDBProps>,
- public IShellExtInit,
- public IShellPropSheetExt
-{
-public:
- CNuvDBProps();
-
-DECLARE_REGISTRY_RESOURCEID(IDR_NUVDBPROPS)
-
-
-BEGIN_COM_MAP(CNuvDBProps)
- COM_INTERFACE_ENTRY(IShellExtInit)
- COM_INTERFACE_ENTRY(IShellPropSheetExt)
-END_COM_MAP()
-
-
- DECLARE_PROTECT_FINAL_CONSTRUCT()
-
- HRESULT FinalConstruct();
- void FinalRelease();
-
-//IShellExtInit
- STDMETHOD(Initialize)(LPCITEMIDLIST pIDFolder,IDataObject *pDataObj,HKEY hkeyProgID);
-
-//IShellPropSheetExt
- STDMETHOD(AddPages)(LPFNSVADDPROPSHEETPAGE pfnAddPage,LPARAM lParam);
- STDMETHOD(ReplacePage)(EXPPS uPageID,LPFNSVADDPROPSHEETPAGE pfnReplaceWith,LPARAM lParam);
-
- static UINT CALLBACK PropSheetPageProc(HWND hwnd,UINT uMsg,LPPROPSHEETPAGE ppsp);
- UINT PageProc(HWND hwnd,UINT uMsg,LPPROPSHEETPAGE ppsp);
-
- static INT_PTR CALLBACK DlgProc(HWND hDlg,UINT uMessage,WPARAM wParam,LPARAM lParam);
- INT_PTR CALLBACK NuvPageDlgProc(HWND hDlg,UINT uMessage,WPARAM wParam,LPARAM lParam);
-
-private:
- LPCITEMIDLIST m_pIDFolder; //The folder's PIDL
- TCHAR m_szFile[MAX_PATH]; //The file name
- CComPtr<IDataObject> m_pDataObj; //The IDataObject pointer
- HKEY m_hRegKey; //The file or folder's registry
- bool m_bMultipleFiles;
-
- CNuvInfo m_FileInfo;
-
- void UpdateDialog(HWND hDlg);
-};
-
-OBJECT_ENTRY_AUTO(__uuidof(NuvDBProps), CNuvDBProps)
Copied: trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.h (from rev 549, trunk/MythTVReader/NuvPropPage/NuvDBProps.h)
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.h (rev 0)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.h 2007-07-15 12:35:40 UTC (rev 550)
@@ -0,0 +1,83 @@
+/////////////////////////////////////////////////////////////////////////////
+// $Id$
+/////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2003 Torbj\xF6rn Jansson. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+ * @file NuvDBProps.h Declaration of the CNuvDBProps
+ */
+
+#pragma once
+#include "resource.h" // main symbols
+
+#include "NuvPropPage.h"
+#include "NuvInfo.h"
+
+extern HINSTANCE g_hInst;
+
+// CNuvDBProps
+
+class ATL_NO_VTABLE CNuvDBProps :
+ public CComObjectRootEx<CComSingleThreadModel>,
+ public CComCoClass<CNuvDBProps, &CLSID_NuvDBProps>,
+ public IShellExtInit,
+ public IShellPropSheetExt
+{
+public:
+ CNuvDBProps();
+
+DECLARE_REGISTRY_RESOURCEID(IDR_NUVDBPROPS)
+
+
+BEGIN_COM_MAP(CNuvDBProps)
+ COM_INTERFACE_ENTRY(IShellExtInit)
+ COM_INTERFACE_ENTRY(IShellPropSheetExt)
+END_COM_MAP()
+
+
+ DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+ HRESULT FinalConstruct();
+ void FinalRelease();
+
+//IShellExtInit
+ STDMETHOD(Initialize)(LPCITEMIDLIST pIDFolder,IDataObject *pDataObj,HKEY hkeyProgID);
+
+//IShellPropSheetExt
+ STDMETHOD(AddPages)(LPFNSVADDPROPSHEETPAGE pfnAddPage,LPARAM lParam);
+ STDMETHOD(ReplacePage)(EXPPS uPageID,LPFNSVADDPROPSHEETPAGE pfnReplaceWith,LPARAM lParam);
+
+ static UINT CALLBACK PropSheetPageProc(HWND hwnd,UINT uMsg,LPPROPSHEETPAGE ppsp);
+ UINT PageProc(HWND hwnd,UINT uMsg,LPPROPSHEETPAGE ppsp);
+
+ static INT_PTR CALLBACK DlgProc(HWND hDlg,UINT uMessage,WPARAM wParam,LPARAM lParam);
+ INT_PTR CALLBACK NuvPageDlgProc(HWND hDlg,UINT uMessage,WPARAM wParam,LPARAM lParam);
+
+private:
+ LPCITEMIDLIST m_pIDFolder; //The folder's PIDL
+ TCHAR m_szFile[MAX_PATH]; //The file name
+ CComPtr<IDataObject> m_pDataObj; //The IDataObject pointer
+ HKEY m_hRegKey; //The file or folder's registry
+ bool m_bMultipleFiles;
+
+ CNuvInfo m_FileInfo;
+
+ void UpdateDialog(HWND hDlg);
+};
+
+OBJECT_ENTRY_AUTO(__uuidof(NuvDBProps), CNuvDBProps)
Deleted: trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.rgs
===================================================================
--- trunk/MythTVReader/NuvPropPage/NuvDBProps.rgs 2007-07-12 16:19:58 UTC (rev 545)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.rgs 2007-07-15 12:35:40 UTC (rev 550)
@@ -1,26 +0,0 @@
-HKCR
-{
- NuvPropPage.NuvDBProps.1 = s 'NuvDBProps Class'
- {
- CLSID = s '{E6118413-72FC-4FAD-9953-5BE30CFCE358}'
- }
- NuvPropPage.NuvDBProps = s 'NuvDBProps Class'
- {
- CLSID = s '{E6118413-72FC-4FAD-9953-5BE30CFCE358}'
- CurVer = s 'NuvPropPage.NuvDBProps.1'
- }
- NoRemove CLSID
- {
- ForceRemove {E6118413-72FC-4FAD-9953-5BE30CFCE358} = s 'NuvDBProps Class'
- {
- ProgID = s 'NuvPropPage.NuvDBProps.1'
- VersionIndependentProgID = s 'NuvPropPage.NuvDBProps'
- InprocServer32 = s '%MODULE%'
- {
- val ThreadingModel = s 'Apartment'
- }
- val AppID = s '%APPID%'
- 'TypeLib' = s '{A9983193-2815-4899-A4A1-1CBED6AD4655}'
- }
- }
-}
Copied: trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.rgs (from rev 549, trunk/MythTVReader/NuvPropPage/NuvDBProps.rgs)
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.rgs (rev 0)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvDBProps.rgs 2007-07-15 12:35:40 UTC (rev 550)
@@ -0,0 +1,26 @@
+HKCR
+{
+ NuvPropPage.NuvDBProps.1 = s 'NuvDBProps Class'
+ {
+ CLSID = s '{E6118413-72FC-4FAD-9953-5BE30CFCE358}'
+ }
+ NuvPropPage.NuvDBProps = s 'NuvDBProps Class'
+ {
+ CLSID = s '{E6118413-72FC-4FAD-9953-5BE30CFCE358}'
+ CurVer = s 'NuvPropPage.NuvDBProps.1'
+ }
+ NoRemove CLSID
+ {
+ ForceRemove {E6118413-72FC-4FAD-9953-5BE30CFCE358} = s 'NuvDBProps Class'
+ {
+ ProgID = s 'NuvPropPage.NuvDBProps.1'
+ VersionIndependentProgID = s 'NuvPropPage.NuvDBProps'
+ InprocServer32 = s '%MODULE%'
+ {
+ val ThreadingModel = s 'Apartment'
+ }
+ val AppID = s '%APPID%'
+ 'TypeLib' = s '{A9983193-2815-4899-A4A1-1CBED6AD4655}'
+ }
+ }
+}
Deleted: trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.cpp
===================================================================
--- trunk/MythTVReader/NuvPropPage/NuvPropPage.cpp 2007-07-12 16:19:58 UTC (rev 545)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.cpp 2007-07-15 12:35:40 UTC (rev 550)
@@ -1,54 +0,0 @@
-// NuvPropPage.cpp : Implementation of DLL Exports.
-
-#include "stdafx.h"
-#include "resource.h"
-#include "NuvPropPage.h"
-
-class CNuvPropPageModule : public CAtlDllModuleT< CNuvPropPageModule >
-{
-public :
- DECLARE_LIBID(LIBID_NuvPropPageLib)
- DECLARE_REGISTRY_APPID_RESOURCEID(IDR_NUVPROPPAGE, "{4CF486CE-C2CD-4EEA-B446-510156C05A0F}")
-};
-
-CNuvPropPageModule _AtlModule;
-
-HINSTANCE g_hInst=NULL;
-
-// DLL Entry Point
-extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
-{
- g_hInst=hInstance;
- return _AtlModule.DllMain(dwReason, lpReserved);
-}
-
-
-// Used to determine whether the DLL can be unloaded by OLE
-STDAPI DllCanUnloadNow(void)
-{
- return _AtlModule.DllCanUnloadNow();
-}
-
-
-// Returns a class factory to create an object of the requested type
-STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
-{
- return _AtlModule.DllGetClassObject(rclsid, riid, ppv);
-}
-
-
-// DllRegisterServer - Adds entries to the system registry
-STDAPI DllRegisterServer(void)
-{
- // registers object, typelib and all interfaces in typelib
- HRESULT hr = _AtlModule.DllRegisterServer();
- return hr;
-}
-
-
-// DllUnregisterServer - Removes entries from the system registry
-STDAPI DllUnregisterServer(void)
-{
- HRESULT hr = _AtlModule.DllUnregisterServer();
- return hr;
-}
Copied: trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.cpp (from rev 549, trunk/MythTVReader/NuvPropPage/NuvPropPage.cpp)
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.cpp (rev 0)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.cpp 2007-07-15 12:35:40 UTC (rev 550)
@@ -0,0 +1,54 @@
+// NuvPropPage.cpp : Implementation of DLL Exports.
+
+#include "stdafx.h"
+#include "resource.h"
+#include "NuvPropPage.h"
+
+class CNuvPropPageModule : public CAtlDllModuleT< CNuvPropPageModule >
+{
+public :
+ DECLARE_LIBID(LIBID_NuvPropPageLib)
+ DECLARE_REGISTRY_APPID_RESOURCEID(IDR_NUVPROPPAGE, "{4CF486CE-C2CD-4EEA-B446-510156C05A0F}")
+};
+
+CNuvPropPageModule _AtlModule;
+
+HINSTANCE g_hInst=NULL;
+
+// DLL Entry Point
+extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
+{
+ g_hInst=hInstance;
+ return _AtlModule.DllMain(dwReason, lpReserved);
+}
+
+
+// Used to determine whether the DLL can be unloaded by OLE
+STDAPI DllCanUnloadNow(void)
+{
+ return _AtlModule.DllCanUnloadNow();
+}
+
+
+// Returns a class factory to create an object of the requested type
+STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
+{
+ return _AtlModule.DllGetClassObject(rclsid, riid, ppv);
+}
+
+
+// DllRegisterServer - Adds entries to the system registry
+STDAPI DllRegisterServer(void)
+{
+ // registers object, typelib and all interfaces in typelib
+ HRESULT hr = _AtlModule.DllRegisterServer();
+ return hr;
+}
+
+
+// DllUnregisterServer - Removes entries from the system registry
+STDAPI DllUnregisterServer(void)
+{
+ HRESULT hr = _AtlModule.DllUnregisterServer();
+ return hr;
+}
Deleted: trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.def
===================================================================
--- trunk/MythTVReader/NuvPropPage/NuvPropPage.def 2007-07-12 16:19:58 UTC (rev 545)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.def 2007-07-15 12:35:40 UTC (rev 550)
@@ -1,9 +0,0 @@
-; NuvPropPage.def : Declares the module parameters.
-
-LIBRARY "NuvPropPage.DLL"
-
-EXPORTS
- DllCanUnloadNow PRIVATE
- DllGetClassObject PRIVATE
- DllRegisterServer PRIVATE
- DllUnregisterServer PRIVATE
Copied: trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.def (from rev 549, trunk/MythTVReader/NuvPropPage/NuvPropPage.def)
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.def (rev 0)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.def 2007-07-15 12:35:40 UTC (rev 550)
@@ -0,0 +1,9 @@
+; NuvPropPage.def : Declares the module parameters.
+
+LIBRARY "NuvPropPage.DLL"
+
+EXPORTS
+ DllCanUnloadNow PRIVATE
+ DllGetClassObject PRIVATE
+ DllRegisterServer PRIVATE
+ DllUnregisterServer PRIVATE
Deleted: trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.idl
===================================================================
--- trunk/MythTVReader/NuvPropPage/NuvPropPage.idl 2007-07-12 16:19:58 UTC (rev 545)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.idl 2007-07-15 12:35:40 UTC (rev 550)
@@ -1,50 +0,0 @@
-// NuvPropPage.idl : IDL source for NuvPropPage
-//
-
-// This file will be processed by the MIDL tool to
-// produce the type library (NuvPropPage.tlb) and marshalling code.
-
-import "oaidl.idl";
-import "ocidl.idl";
-
-[
- uuid(A9983193-2815-4899-A4A1-1CBED6AD4655),
- version(1.0),
- helpstring("NuvPropPage 1.0 Type Library")
-]
-library NuvPropPageLib
-{
- importlib("stdole2.tlb");
- [
- uuid(825D30CF-C997-420A-96CD-24EEA350F03C),
- helpstring("NuvProps Class")
- ]
- coclass NuvProps
- {
- [default] interface IUnknown;
- };
- [
- uuid(86F08DD4-907C-4C94-8BBD-F70242A4883F),
- helpstring("NuvColHandler Class")
- ]
- coclass NuvColHandler
- {
- [default] interface IUnknown;
- };
- [
- uuid(E6118413-72FC-4FAD-9953-5BE30CFCE358),
- helpstring("NuvDBProps Class")
- ]
- coclass NuvDBProps
- {
- [default] interface IUnknown;
- };
- [
- uuid(0A9A5748-13FB-4F77-8321-3536D94AB86E),
- helpstring("NuvToolTip Class")
- ]
- coclass NuvToolTip
- {
- [default] interface IUnknown;
- };
-};
Copied: trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.idl (from rev 549, trunk/MythTVReader/NuvPropPage/NuvPropPage.idl)
===================================================================
--- trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.idl (rev 0)
+++ trunk/MythTVReader/Shell/NuvPropPage/NuvPropPage.idl 2007-07-15 12:35:40 UTC (rev 550)
@@ -0,0 +1,50 @@
+// NuvPropPage.idl : IDL source for NuvPropPage
+//
+
+// This file will be processed by the MIDL tool to
+// produce the type library (NuvPropPage.tlb) and marshalling code.
+
+import "oaidl.idl";
+import "ocidl.idl";
+
+[
+ uuid(A9983193-2815-4899-A4A1-1CBED6AD4655),
+ version(1.0),
+ helpstring("NuvPropPage 1.0 Type Library")
+]
+library NuvPropPageLib
+{
+ importlib("stdole2.tlb");
+ [
+ uuid(825D30CF-C997-420A-96CD-24EEA350F03C),
+ helpstring("NuvProps Class")
+ ]
+ coclass NuvProps
+ {
+ [default] interface IUnknown;
+ };
+ [
+ uuid(86F08DD4-907C-4C94-8BBD-F70242A4883F),
+ helpstring("NuvColHandler Class")
+ ]
+ coclass NuvColHandler
+ {
+ [default] interface IUnknown;
+ };
+ [
+ uuid(E6118413-72FC-4FAD-9953-5BE30CFCE358),
+ helpstring("NuvDBProps Class")
+ ]
+ coclass NuvDBProps
+ {
+ [default] interface IUnknown;
+ };
+ [
+ uuid(0A9...
[truncated message content] |
|
From: <to...@us...> - 2007-07-15 12:29:48
|
Revision: 547
http://svn.sourceforge.net/dsmyth/?rev=547&view=rev
Author: tobbej
Date: 2007-07-15 05:20:42 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
more properties
Modified Paths:
--------------
trunk/MythTVReader/PropertyHandler/MythTVProperties.cpp
trunk/MythTVReader/PropertyHandler/MythTVProperties.h
trunk/MythTVReader/PropertyHandler/PropertyHandler.vcproj
trunk/MythTVReader/PropertyHandler/stdafx.h
Modified: trunk/MythTVReader/PropertyHandler/MythTVProperties.cpp
===================================================================
--- trunk/MythTVReader/PropertyHandler/MythTVProperties.cpp 2007-07-15 11:47:26 UTC (rev 546)
+++ trunk/MythTVReader/PropertyHandler/MythTVProperties.cpp 2007-07-15 12:20:42 UTC (rev 547)
@@ -25,7 +25,6 @@
#include "stdafx.h"
#include "MythTVProperties.h"
#include "utils.h"
-#include <propvarutil.h>
// CMythTVProperties
@@ -116,8 +115,8 @@
HRESULT hr=PSCreateMemoryPropertyStore(IID_PPV_ARGS(&m_pStoreCache));
if(SUCCEEDED(hr))
{
- StoreDataInCache(PKEY_Kind,KIND_RECORDEDTV);
- StoreDataInCache(PKEY_KindText,L"MythTV recording");
+ StoreDataInCacheStringVector(PKEY_Kind,CAtlStringW(KIND_RECORDEDTV));
+ StoreDataInCache(PKEY_KindText,L"Recorded TV");
CNuvInfo::CFileInfo info;
CNuvInfo FileInfo;
@@ -127,11 +126,13 @@
StoreDataInCache(PKEY_Title,info.m_ProgramInfo.m_title);
StoreDataInCache(PKEY_Media_SubTitle,info.m_ProgramInfo.m_subtitle);
StoreDataInCache(PKEY_RecordedTV_ProgramDescription,info.m_ProgramInfo.m_description);
+ //must be an integer but chanstr can be a channel number that can't be
+ //converted to an integer
//StoreDataInCache(PKEY_RecordedTV_ChannelNumber,info.m_ProgramInfo.m_chanstr);
StoreDataInCache(PKEY_RecordedTV_StationCallSign,info.m_ProgramInfo.m_chansign);
StoreDataInCache(PKEY_RecordedTV_StationName,info.m_ProgramInfo.m_channame);
- CTimeSpan tmp=info.m_ProgramInfo.m_recendts-info.m_ProgramInfo.m_recstartts;
+ CTimeSpan tmp=info.m_ProgramInfo.m_endts-info.m_ProgramInfo.m_startts;
ULONGLONG length=tmp.GetTotalSeconds()*10000000;
StoreDataInCache(PKEY_Media_Duration,length);
@@ -143,16 +144,134 @@
//SYSTEMTIME must be in UTC so we have to convert our timestamp from
//localtime to UTC
TIME_ZONE_INFORMATION tz;
- if(GetTimeZoneInformation(&tz)!=TIME_ZONE_ID_INVALID)
+ DWORD dwRet=GetTimeZoneInformation(&tz);
+ if(dwRet!=TIME_ZONE_ID_INVALID)
{
TzSpecificLocalTimeToSystemTime(&tz,&st,&ut);
+ //something is wrong here one hour off sometimes
if(SystemTimeToFileTime(&ut,&ft))
{
StoreDataInCache(PKEY_RecordedTV_RecordingTime,ft);
}
}
StoreDataInCacheStringVector(PKEY_Keywords,info.m_ProgramInfo.m_category);
+ StoreDataInCache(PKEY_RecordedTV_IsRepeatBroadcast,(BOOL)(info.m_ProgramInfo.m_repeat ? TRUE : FALSE));
+ StoreDataInCache(PKEY_RecordedTV_IsHDContent,(BOOL)(info.m_ProgramInfo.m_programflags&FL_HDTV ? TRUE : FALSE));
+ StoreDataInCache(PKEY_RecordedTV_IsClosedCaptioningAvailable,(BOOL)(info.m_ProgramInfo.m_programflags&FL_CC ? TRUE : FALSE));
+ try
+ {
+ CDBUtils util;
+ mysqlpp::Connection con(false);
+ if(util.Connect(con))
+ {
+ mysqlpp::Query query=con.query();
+ query << "SELECT airdate FROM ";
+ query << (info.m_ProgramInfo.m_filesize>0 ? "recordedprogram" : "program");
+ query << " WHERE chanid = %0q:chanid AND starttime = FROM_UNIXTIME(%1q:starttime) ;";
+ query.parse();
+ query.def["chanid"]=info.m_ProgramInfo.m_chanid;
+ query.def["starttime"]=info.m_ProgramInfo.m_startts.GetTime();
+ mysqlpp::Result res=query.store();
+ if(res && res.num_rows()>0)
+ {
+ mysqlpp::Row row=res.at(0);
+ ULONG year=row.at(0);
+ if(year>0)
+ {
+ StoreDataInCache(PKEY_Media_Year,year);
+ }
+ }
+ if(info.m_ProgramInfo.m_endts!=info.m_ProgramInfo.m_startts)
+ {
+ mysqlpp::Query query2=con.query();
+ query2 << "SELECT role,people.name FROM ";
+ query2 << (info.m_ProgramInfo.m_filesize>0 ?
+ "recordedcredits AS credits" : "credits");
+ query2 << " LEFT JOIN people ON credits.person = people.person"
+ " WHERE credits.chanid = %0q:chanid"
+ " AND credits.starttime = FROM_UNIXTIME(%1q:starttime)"
+ " ORDER BY role;";
+ query2.parse();
+ query2.def["chanid"]=info.m_ProgramInfo.m_chanid;
+ query2.def["starttime"]=info.m_ProgramInfo.m_startts.GetTime();
+ mysqlpp::Result res=query2.store();
+
+ CAtlStringW actors;
+ CAtlStringW directors;
+ CAtlStringW hosts;
+ CAtlStringW gueststars;
+ CAtlStringW producers;
+
+ mysqlpp::Row row;
+ for(mysqlpp::Row::size_type i=0;row=res.at(i);++i)
+ {
+ if(row["role"].compare("actor")==0)
+ {
+ actors+=CA2W(row["name"],CP_UTF8);
+ actors+=L";";
+ }
+ else if(row["role"].compare("director")==0)
+ {
+ directors+=CA2W(row["name"],CP_UTF8);
+ directors+=L";";
+ }
+ else if(row["role"].compare("host")==0)
+ {
+ hosts+=CA2W(row["name"],CP_UTF8);
+ hosts+=L";";
+ }
+ else if(row["role"].compare("guest_star")==0)
+ {
+ gueststars+=CA2W(row["name"],CP_UTF8);
+ gueststars+=";";
+ }
+ else if(row["role"].compare("producer")==0)
+ {
+ producers+=CA2W(row["name"],CP_UTF8);
+ producers+=L";";
+ }
+ }
+ if(directors.GetLength()>0)
+ {
+ StoreDataInCacheStringVector(PKEY_Video_Director,directors);
+ }
+ if(producers.GetLength()>0)
+ {
+ StoreDataInCacheStringVector(PKEY_Media_Producer,producers);
+ }
+ if(actors.GetLength()>0 ||
+ directors.GetLength()>0 ||
+ hosts.GetLength()>0 ||
+ gueststars.GetLength()>0 )
+ {
+ CAtlStringW credits;
+ actors.Replace(';','/');
+ credits=actors;
+ credits+=L";";
+ directors.Replace(';','/');
+ credits+=directors;
+ credits+=L";";
+ hosts.Replace(';','/');
+ credits+=hosts;
+ credits+=L";";
+ gueststars.Replace(';','/');
+ credits+=gueststars;
+
+ StoreDataInCache(PKEY_RecordedTV_Credits,credits);
+ }
+
+ }
+ }
+ }
+ catch(mysqlpp::Exception &e)
+ {
+ ATLTRACE(_T("%s(%d) : CMythTVProperties::Initialize db exception: %s\n"),__FILE__,__LINE__,e.what());
+ }
+ //only using 4 stars as a maximum since thats what mythtv uses
+ //maybe we shoud use all 5?
+ StoreDataInCache(PKEY_Rating,(ULONG)(info.m_ProgramInfo.m_stars*100-25+1));
+
CAtlStringW contents;
contents=info.m_ProgramInfo.m_title;
contents+=L" ";
@@ -171,13 +290,6 @@
StoreDataInCache(PKEY_Video_FrameWidth,(ULONG)info.m_rtFileHeader.width);
StoreDataInCache(PKEY_Video_FrameRate,(ULONG)info.m_rtFileHeader.fps*1000);
- CAtlStringW VideoFourCC;
- char tmp[5];
- tmp[4]=0;
- memcpy_s(tmp,4,&info.m_ExtendedData.video_fourcc,4);
- VideoFourCC=CA2W(tmp);
- StoreDataInCache(PKEY_Video_FourCC,VideoFourCC);
-
if(info.m_bUsingExtendedData)
{
double rate=info.m_ExtendedData.audio_bits_per_sample*info.m_ExtendedData.audio_channels*info.m_ExtendedData.audio_sample_rate/(1000*info.m_ExtendedData.audio_compression_ratio);
@@ -185,6 +297,17 @@
StoreDataInCache(PKEY_Audio_EncodingBitrate,(ULONG)bitrate*1000);
StoreDataInCache(PKEY_Audio_ChannelCount,(ULONG)info.m_ExtendedData.audio_channels);
StoreDataInCache(PKEY_Audio_SampleRate,(ULONG)info.m_ExtendedData.audio_sample_rate);
+ if(info.m_ExtendedData.audio_fourcc==MAKEFOURCC('L','A','M','E'))
+ {
+ StoreDataInCache(PKEY_Audio_Compression,L"MP3");
+ }
+ else if(info.m_ExtendedData.audio_fourcc==MAKEFOURCC('L','A','M','E'))
+ {
+ StoreDataInCache(PKEY_Audio_Compression,L"PCM");
+ }
+
+ StoreDataInCache(PKEY_Video_EncodingBitrate,info.m_ExtendedData.lavc_bitrate);
+ StoreDataInCache(PKEY_Video_FourCC,(ULONG)info.m_ExtendedData.video_fourcc);
}
}
}
@@ -238,7 +361,17 @@
}
PropVariantClear(&pv);
}
-
+void CMythTVProperties::StoreDataInCache(PROPERTYKEY key,BOOL data)
+{
+ PROPVARIANT pv;
+ PropVariantInit(&pv);
+ HRESULT hr=InitPropVariantFromBoolean(data,&pv);
+ if(SUCCEEDED(hr))
+ {
+ hr=m_pStoreCache->SetValueAndState(key,&pv,PSC_NORMAL);
+ }
+ PropVariantClear(&pv);
+}
void CMythTVProperties::StoreDataInCacheStringVector(PROPERTYKEY key,CAtlStringW &data)
{
PROPVARIANT pv;
Modified: trunk/MythTVReader/PropertyHandler/MythTVProperties.h
===================================================================
--- trunk/MythTVReader/PropertyHandler/MythTVProperties.h 2007-07-15 11:47:26 UTC (rev 546)
+++ trunk/MythTVReader/PropertyHandler/MythTVProperties.h 2007-07-15 12:20:42 UTC (rev 547)
@@ -83,6 +83,7 @@
void StoreDataInCache(PROPERTYKEY key,ULONG data);
void StoreDataInCache(PROPERTYKEY key,ULONGLONG data);
void StoreDataInCache(PROPERTYKEY key,FILETIME &data);
+ void StoreDataInCache(PROPERTYKEY key,BOOL data);
void StoreDataInCacheStringVector(PROPERTYKEY key,CAtlStringW &data);
CComPtr<IStream> m_pStream;
Modified: trunk/MythTVReader/PropertyHandler/PropertyHandler.vcproj
===================================================================
--- trunk/MythTVReader/PropertyHandler/PropertyHandler.vcproj 2007-07-15 11:47:26 UTC (rev 546)
+++ trunk/MythTVReader/PropertyHandler/PropertyHandler.vcproj 2007-07-15 12:20:42 UTC (rev 547)
@@ -316,10 +316,6 @@
</FileConfiguration>
</File>
</Filter>
- <File
- RelativePath=".\ReadMe.txt"
- >
- </File>
</Files>
<Globals>
</Globals>
Modified: trunk/MythTVReader/PropertyHandler/stdafx.h
===================================================================
--- trunk/MythTVReader/PropertyHandler/stdafx.h 2007-07-15 11:47:26 UTC (rev 546)
+++ trunk/MythTVReader/PropertyHandler/stdafx.h 2007-07-15 12:20:42 UTC (rev 547)
@@ -31,7 +31,6 @@
#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
#include "resource.h"
#include <atlbase.h>
#include <atlcom.h>
@@ -39,6 +38,8 @@
#include <shobjidl.h> // IInitializeWithStream, IDestinationStreamFactory
#include <propsys.h> // Property System APIs and interfaces
#include <propkey.h> // System PROPERTYKEY definitions
+#include <propvarutil.h>
#include <atltime.h>
+#include <atlcoll.h>
using namespace ATL;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-07-15 12:26:48
|
Revision: 549
http://svn.sourceforge.net/dsmyth/?rev=549&view=rev
Author: tobbej
Date: 2007-07-15 05:26:46 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
change start/end times to use the time when mythbackend started/ended recording and not when the program started/ended.
Modified Paths:
--------------
trunk/MythTVReader/NuvPropPage/NuvDBProps.cpp
trunk/MythTVReader/NuvPropPage/NuvToolTip.cpp
Modified: trunk/MythTVReader/NuvPropPage/NuvDBProps.cpp
===================================================================
--- trunk/MythTVReader/NuvPropPage/NuvDBProps.cpp 2007-07-15 12:25:13 UTC (rev 548)
+++ trunk/MythTVReader/NuvPropPage/NuvDBProps.cpp 2007-07-15 12:26:46 UTC (rev 549)
@@ -232,9 +232,9 @@
SetDlgItemText(hDlg,IDC_DBINFO_TITLE,CW2A(info.m_ProgramInfo.m_title.GetBuffer()));
SetDlgItemText(hDlg,IDC_DBINFO_SUBTITLE,CW2A(info.m_ProgramInfo.m_subtitle.GetBuffer()));
SetDlgItemText(hDlg,IDC_DBINFO_CATEGORY,CW2A(info.m_ProgramInfo.m_category.GetBuffer()));
- SetDlgItemText(hDlg,IDC_DBINFO_STARTTIME,(LPCSTR)info.m_ProgramInfo.m_recstartts.Format("%c"));
+ SetDlgItemText(hDlg,IDC_DBINFO_STARTTIME,(LPCSTR)info.m_ProgramInfo.m_startts.Format("%c"));
- CTimeSpan length=info.m_ProgramInfo.m_recendts-info.m_ProgramInfo.m_recstartts;
+ CTimeSpan length=info.m_ProgramInfo.m_endts-info.m_ProgramInfo.m_startts;
CAtlString format=length.GetDays()>0 ? "%D %H:%M:%S" : "%H:%M:%S";
SetDlgItemText(hDlg,IDC_DBINFO_LENGTH,(LPCSTR)length.Format(format));
SetDlgItemText(hDlg,IDC_DBINFO_DESCRIPTION,CW2A(info.m_ProgramInfo.m_description.GetBuffer()));
Modified: trunk/MythTVReader/NuvPropPage/NuvToolTip.cpp
===================================================================
--- trunk/MythTVReader/NuvPropPage/NuvToolTip.cpp 2007-07-15 12:25:13 UTC (rev 548)
+++ trunk/MythTVReader/NuvPropPage/NuvToolTip.cpp 2007-07-15 12:26:46 UTC (rev 549)
@@ -112,7 +112,7 @@
}
tip+="Recorded at: ";
- tip+=fileinfo.m_ProgramInfo.m_recstartts.Format("%c");
+ tip+=fileinfo.m_ProgramInfo.m_startts.Format("%c");
if(fileinfo.m_ProgramInfo.m_channame.GetLength()>0)
{
tip+=" on ";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-07-15 12:25:15
|
Revision: 548
http://svn.sourceforge.net/dsmyth/?rev=548&view=rev
Author: tobbej
Date: 2007-07-15 05:25:13 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
update to libmySQL.dll v4.1.22
the v5.0.45 have problems.
Modified Paths:
--------------
trunk/MythTVReader/InnoSetup/libmySQL.dll
Modified: trunk/MythTVReader/InnoSetup/libmySQL.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-07-15 11:47:29
|
Revision: 546
http://svn.sourceforge.net/dsmyth/?rev=546&view=rev
Author: tobbej
Date: 2007-07-15 04:47:26 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
get rid of some warnings
Modified Paths:
--------------
trunk/MythTVReader/NuvConv/stdafx.h
Modified: trunk/MythTVReader/NuvConv/stdafx.h
===================================================================
--- trunk/MythTVReader/NuvConv/stdafx.h 2007-07-12 16:19:58 UTC (rev 545)
+++ trunk/MythTVReader/NuvConv/stdafx.h 2007-07-15 11:47:26 UTC (rev 546)
@@ -51,6 +51,9 @@
// turns off MFC's hiding of some common and often safely ignored warning messages
#define _AFX_ALL_WARNINGS
+//dont deprecate old stuff, atl uses those
+#define STRSAFE_NO_DEPRECATE
+
#include <afxwin.h> // MFC core and standard components
#include <afxext.h> // MFC extensions
#include <afxdisp.h> // MFC Automation classes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-07-12 16:20:34
|
Revision: 545
http://svn.sourceforge.net/dsmyth/?rev=545&view=rev
Author: tobbej
Date: 2007-07-12 09:19:58 -0700 (Thu, 12 Jul 2007)
Log Message:
-----------
* workaround for missing min() and max()
* get rid of some compilation warnings from atl
* fix some more strings i forgot after the changes to CProgramInfo
Modified Paths:
--------------
trunk/MythTVReader/DSMyth/NuvReader.h
trunk/MythTVReader/DSMyth/StdAfx.h
trunk/MythTVReader/MythSource/MythSourceFilter.cpp
trunk/MythTVReader/MythSource/MythSourceFilter.h
trunk/MythTVReader/MythSource/stdafx.h
trunk/MythTVReader/MythTVReader.sln
trunk/MythTVReader/NuvConv/stdafx.h
trunk/MythTVReader/NuvPropPage/stdafx.h
trunk/MythTVReader/common/NuvInfo.h
trunk/MythTVReader/common/common.vcproj
trunk/MythTVReader/common/utils.h
Added Paths:
-----------
trunk/MythTVReader/common/fixit.h
Modified: trunk/MythTVReader/DSMyth/NuvReader.h
===================================================================
--- trunk/MythTVReader/DSMyth/NuvReader.h 2007-07-11 21:10:28 UTC (rev 544)
+++ trunk/MythTVReader/DSMyth/NuvReader.h 2007-07-12 16:19:58 UTC (rev 545)
@@ -33,6 +33,7 @@
#include "SeekTableThread.h"
#include "..\MythSource\MythSource.h"
#include "SeekTable.h"
+#include "fixit.h"
// {1EA72153-CC9E-494c-A2D2-59E632685748}
// Custom media subtype
Modified: trunk/MythTVReader/DSMyth/StdAfx.h
===================================================================
--- trunk/MythTVReader/DSMyth/StdAfx.h 2007-07-11 21:10:28 UTC (rev 544)
+++ trunk/MythTVReader/DSMyth/StdAfx.h 2007-07-12 16:19:58 UTC (rev 545)
@@ -41,6 +41,9 @@
//#define _ATL_DEBUG_QI
//#endif
+//dont deprecate old stuff, atl uses those
+#define STRSAFE_NO_DEPRECATE
+
#include <atlbase.h>
//You may derive a class from CComModule and use it if you want to override
//something, but do not change the name of _Module
Modified: trunk/MythTVReader/MythSource/MythSourceFilter.cpp
===================================================================
--- trunk/MythTVReader/MythSource/MythSourceFilter.cpp 2007-07-11 21:10:28 UTC (rev 544)
+++ trunk/MythTVReader/MythSource/MythSourceFilter.cpp 2007-07-12 16:19:58 UTC (rev 545)
@@ -791,16 +791,16 @@
CProgramInfo info;
pChain->GetProgramAt(lIndex,info);
CAtlStringW name;
- name=CA2W(info.m_title,CP_UTF8);
+ name=info.m_title;
if(info.m_subtitle.GetLength()>0)
{
name+=L": ";
- name+=CA2W(info.m_subtitle,CP_UTF8);
+ name+=info.m_subtitle;
}
if(info.m_chansign.GetLength()>0)
{
name+=L" (";
- name+=CA2W(info.m_chansign,CP_UTF8);
+ name+=info.m_chansign;
name+=L")";
}
ULONG size=name.GetLength()+1;
@@ -1216,4 +1216,4 @@
return m_pSeekPin->SendEndOfStream();
}
return S_OK;
-}
\ No newline at end of file
+}
Modified: trunk/MythTVReader/MythSource/MythSourceFilter.h
===================================================================
--- trunk/MythTVReader/MythSource/MythSourceFilter.h 2007-07-11 21:10:28 UTC (rev 544)
+++ trunk/MythTVReader/MythSource/MythSourceFilter.h 2007-07-12 16:19:58 UTC (rev 545)
@@ -31,6 +31,7 @@
#include "BaseFilter.h"
#include "_IBackendEvents_CP.H"
#include "ComFilterEventReceiver.h"
+#include "fixit.h"
class CAsyncOutputPin;
class CMemOutPin;
Modified: trunk/MythTVReader/MythSource/stdafx.h
===================================================================
--- trunk/MythTVReader/MythSource/stdafx.h 2007-07-11 21:10:28 UTC (rev 544)
+++ trunk/MythTVReader/MythSource/stdafx.h 2007-07-12 16:19:58 UTC (rev 545)
@@ -54,6 +54,9 @@
// turns off ATL's hiding of some common and often safely ignored warning messages
#define _ATL_ALL_WARNINGS
+//dont deprecate old stuff, atl uses those
+#define STRSAFE_NO_DEPRECATE
+
#include "resource.h"
#include <atlbase.h>
#include <atlcom.h>
Modified: trunk/MythTVReader/MythTVReader.sln
===================================================================
--- trunk/MythTVReader/MythTVReader.sln 2007-07-11 21:10:28 UTC (rev 544)
+++ trunk/MythTVReader/MythTVReader.sln 2007-07-12 16:19:58 UTC (rev 545)
@@ -2,8 +2,8 @@
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSMyth", "DSMyth\DSMyth.vcproj", "{F6B27C5D-7691-4815-81A0-0C224E72398B}"
ProjectSection(ProjectDependencies) = postProject
+ {5F161F3E-2B8B-4C77-8572-41007C10A02A} = {5F161F3E-2B8B-4C77-8572-41007C10A02A}
{8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {8A693FB2-FAA6-407B-80C7-08C5C48C5381}
- {5F161F3E-2B8B-4C77-8572-41007C10A02A} = {5F161F3E-2B8B-4C77-8572-41007C10A02A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtjpg", "rtjpg\rtjpg.vcproj", "{D5CC2DA7-33FD-4ACD-B0ED-E32418612331}"
@@ -15,19 +15,19 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MythSource", "MythSource\MythSource.vcproj", "{5F161F3E-2B8B-4C77-8572-41007C10A02A}"
ProjectSection(ProjectDependencies) = postProject
- {E255F9F0-9185-4D5A-9497-A23259CE1769} = {E255F9F0-9185-4D5A-9497-A23259CE1769}
+ {366D3D7C-DEED-4F5E-B506-3B235AB0B75C} = {366D3D7C-DEED-4F5E-B506-3B235AB0B75C}
+ {4E805F8C-4927-43D8-B6E4-C8F82AF670C3} = {4E805F8C-4927-43D8-B6E4-C8F82AF670C3}
{8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {8A693FB2-FAA6-407B-80C7-08C5C48C5381}
- {4E805F8C-4927-43D8-B6E4-C8F82AF670C3} = {4E805F8C-4927-43D8-B6E4-C8F82AF670C3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Config", "Config\Config.vcproj", "{4F964E4A-B778-4173-94A6-EAC25FD43885}"
ProjectSection(ProjectDependencies) = postProject
- {E255F9F0-9185-4D5A-9497-A23259CE1769} = {E255F9F0-9185-4D5A-9497-A23259CE1769}
+ {366D3D7C-DEED-4F5E-B506-3B235AB0B75C} = {366D3D7C-DEED-4F5E-B506-3B235AB0B75C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcproj", "{8A693FB2-FAA6-407B-80C7-08C5C48C5381}"
ProjectSection(ProjectDependencies) = postProject
- {E255F9F0-9185-4D5A-9497-A23259CE1769} = {E255F9F0-9185-4D5A-9497-A23259CE1769}
+ {366D3D7C-DEED-4F5E-B506-3B235AB0B75C} = {366D3D7C-DEED-4F5E-B506-3B235AB0B75C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NuvConv", "NuvConv\NuvConv.vcproj", "{86F43618-AE3C-481F-881F-F9871437A0FA}"
@@ -35,8 +35,6 @@
{8A693FB2-FAA6-407B-80C7-08C5C48C5381} = {8A693FB2-FAA6-407B-80C7-08C5C48C5381}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysql++", "libs\mysql++\win32\mysql++.vcproj", "{E255F9F0-9185-4D5A-9497-A23259CE1769}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdvbpsi", "libs\libdvbpsi\vc++\libdvbpsi.vcproj", "{4E805F8C-4927-43D8-B6E4-C8F82AF670C3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PropertyHandler", "PropertyHandler\PropertyHandler.vcproj", "{B71EB910-12E4-4C96-B0C2-5284188F2C9D}"
@@ -49,6 +47,8 @@
{B71EB910-12E4-4C96-B0C2-5284188F2C9D} = {B71EB910-12E4-4C96-B0C2-5284188F2C9D}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlpp", "libs\mysql++\mysql++_mysqlpp.vcproj", "{366D3D7C-DEED-4F5E-B506-3B235AB0B75C}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -83,10 +83,6 @@
{86F43618-AE3C-481F-881F-F9871437A0FA}.Debug|Win32.Build.0 = Debug|Win32
{86F43618-AE3C-481F-881F-F9871437A0FA}.Release|Win32.ActiveCfg = Release|Win32
{86F43618-AE3C-481F-881F-F9871437A0FA}.Release|Win32.Build.0 = Release|Win32
- {E255F9F0-9185-4D5A-9497-A23259CE1769}.Debug|Win32.ActiveCfg = Debug|Win32
- {E255F9F0-9185-4D5A-9497-A23259CE1769}.Debug|Win32.Build.0 = Debug|Win32
- {E255F9F0-9185-4D5A-9497-A23259CE1769}.Release|Win32.ActiveCfg = Release|Win32
- {E255F9F0-9185-4D5A-9497-A23259CE1769}.Release|Win32.Build.0 = Release|Win32
{4E805F8C-4927-43D8-B6E4-C8F82AF670C3}.Debug|Win32.ActiveCfg = Debug|Win32
{4E805F8C-4927-43D8-B6E4-C8F82AF670C3}.Debug|Win32.Build.0 = Debug|Win32
{4E805F8C-4927-43D8-B6E4-C8F82AF670C3}.Release|Win32.ActiveCfg = Release|Win32
@@ -97,6 +93,10 @@
{B71EB910-12E4-4C96-B0C2-5284188F2C9D}.Release|Win32.Build.0 = Release|Win32
{F65AED6A-743C-4E23-A6B3-C17F4A19196B}.Debug|Win32.ActiveCfg = Debug|Win32
{F65AED6A-743C-4E23-A6B3-C17F4A19196B}.Release|Win32.ActiveCfg = Release|Win32
+ {366D3D7C-DEED-4F5E-B506-3B235AB0B75C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {366D3D7C-DEED-4F5E-B506-3B235AB0B75C}.Debug|Win32.Build.0 = Debug|Win32
+ {366D3D7C-DEED-4F5E-B506-3B235AB0B75C}.Release|Win32.ActiveCfg = Release|Win32
+ {366D3D7C-DEED-4F5E-B506-3B235AB0B75C}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/MythTVReader/NuvConv/stdafx.h
===================================================================
--- trunk/MythTVReader/NuvConv/stdafx.h 2007-07-11 21:10:28 UTC (rev 544)
+++ trunk/MythTVReader/NuvConv/stdafx.h 2007-07-12 16:19:58 UTC (rev 545)
@@ -64,6 +64,7 @@
#include <dshow.h>
#include <atlstr.h>
+#include <atlcoll.h>
//#ifdef _UNICODE
#if defined _M_IX86
Modified: trunk/MythTVReader/NuvPropPage/stdafx.h
===================================================================
--- trunk/MythTVReader/NuvPropPage/stdafx.h 2007-07-11 21:10:28 UTC (rev 544)
+++ trunk/MythTVReader/NuvPropPage/stdafx.h 2007-07-12 16:19:58 UTC (rev 545)
@@ -68,6 +68,7 @@
#include <atlstr.h>
#include <atltime.h>
#include <ATLComTime.h>
+#include <atlcoll.h>
using namespace ATL;
Modified: trunk/MythTVReader/common/NuvInfo.h
===================================================================
--- trunk/MythTVReader/common/NuvInfo.h 2007-07-11 21:10:28 UTC (rev 544)
+++ trunk/MythTVReader/common/NuvInfo.h 2007-07-12 16:19:58 UTC (rev 545)
@@ -25,7 +25,6 @@
#pragma once
#include "format.h"
-#include <atlcoll.h>
#include "DBUtils.h"
#include "mysql++.h"
#include "ProgramInfo.h"
Modified: trunk/MythTVReader/common/common.vcproj
===================================================================
--- trunk/MythTVReader/common/common.vcproj 2007-07-11 21:10:28 UTC (rev 544)
+++ trunk/MythTVReader/common/common.vcproj 2007-07-12 16:19:58 UTC (rev 545)
@@ -306,6 +306,10 @@
>
</File>
<File
+ RelativePath=".\fixit.h"
+ >
+ </File>
+ <File
RelativePath=".\format.h"
>
</File>
Added: trunk/MythTVReader/common/fixit.h
===================================================================
--- trunk/MythTVReader/common/fixit.h (rev 0)
+++ trunk/MythTVReader/common/fixit.h 2007-07-12 16:19:58 UTC (rev 545)
@@ -0,0 +1,36 @@
+/////////////////////////////////////////////////////////////////////////////
+// $Id$
+/////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2007 Torbj\xF6rn Jansson. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+ * @file fixit.h a workaroud for missing min() and max()
+ */
+
+#if defined(_WINDEF_) && !defined(max)
+#pragma message("windef.h is included but max is still missing")
+#endif
+
+//stupid include file mess
+//probably circular include dependencys somewere messing up windef.h
+#ifndef max
+#define max(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+#ifndef min
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+#endif
\ No newline at end of file
Modified: trunk/MythTVReader/common/utils.h
===================================================================
--- trunk/MythTVReader/common/utils.h 2007-07-11 21:10:28 UTC (rev 544)
+++ trunk/MythTVReader/common/utils.h 2007-07-12 16:19:58 UTC (rev 545)
@@ -22,6 +22,8 @@
* @file utils.h
*/
+#pragma once
+
#include <dshow.h>
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-07-11 21:10:30
|
Revision: 544
http://svn.sourceforge.net/dsmyth/?rev=544&view=rev
Author: tobbej
Date: 2007-07-11 14:10:28 -0700 (Wed, 11 Jul 2007)
Log Message:
-----------
Fix a few things i forgot after changing CProgramInfo to use wide strings
Modified Paths:
--------------
trunk/MythTVReader/MythSource/MythSourcePage.cpp
trunk/MythTVReader/MythSource/RecordedProgramsPage.cpp
trunk/MythTVReader/NuvConv/Convert.cpp
Modified: trunk/MythTVReader/MythSource/MythSourcePage.cpp
===================================================================
--- trunk/MythTVReader/MythSource/MythSourcePage.cpp 2007-07-11 21:02:40 UTC (rev 543)
+++ trunk/MythTVReader/MythSource/MythSourcePage.cpp 2007-07-11 21:10:28 UTC (rev 544)
@@ -173,12 +173,12 @@
CProgramInfo proginfo;
proginfo.FromString(CAtlString(pProgInfo));
///@todo fix the character conversion to do something better and still be compatible with win9x/me
- SetDlgItemText(IDC_MYTHSOURCEPAGE_TITLE,CW2A(CA2W(proginfo.m_title,CP_UTF8)));
- SetDlgItemText(IDC_MYTHSOURCEPAGE_SUBTITLE,CW2A(CA2W(proginfo.m_subtitle,CP_UTF8)));
- SetDlgItemText(IDC_MYTHSOURCEPAGE_CATEGORY,CW2A(CA2W(proginfo.m_category,CP_UTF8)));
- SetDlgItemText(IDC_MYTHSOURCEPAGE_CHANNEL,CW2A(CA2W(proginfo.m_channame,CP_UTF8)));
- SetDlgItemText(IDC_MYTHSOURCEPAGE_CALLSIGN,CW2A(CA2W(proginfo.m_chansign,CP_UTF8)));
- SetDlgItemText(IDC_MYTHSOURCEPAGE_DESCRIPTION,CW2A(CA2W(proginfo.m_description,CP_UTF8)));
+ SetDlgItemText(IDC_MYTHSOURCEPAGE_TITLE,CW2A(proginfo.m_title,CP_UTF8));
+ SetDlgItemText(IDC_MYTHSOURCEPAGE_SUBTITLE,CW2A(proginfo.m_subtitle,CP_UTF8));
+ SetDlgItemText(IDC_MYTHSOURCEPAGE_CATEGORY,CW2A(proginfo.m_category,CP_UTF8));
+ SetDlgItemText(IDC_MYTHSOURCEPAGE_CHANNEL,CW2A(proginfo.m_channame,CP_UTF8));
+ SetDlgItemText(IDC_MYTHSOURCEPAGE_CALLSIGN,CW2A(proginfo.m_chansign,CP_UTF8));
+ SetDlgItemText(IDC_MYTHSOURCEPAGE_DESCRIPTION,CW2A(proginfo.m_description,CP_UTF8));
CoTaskMemFree(pProgInfo);
pProgInfo=NULL;
Modified: trunk/MythTVReader/MythSource/RecordedProgramsPage.cpp
===================================================================
--- trunk/MythTVReader/MythSource/RecordedProgramsPage.cpp 2007-07-11 21:02:40 UTC (rev 543)
+++ trunk/MythTVReader/MythSource/RecordedProgramsPage.cpp 2007-07-11 21:10:28 UTC (rev 544)
@@ -193,8 +193,7 @@
{
LVITEMW lvi;
lvi.mask=LVIF_TEXT|LVIF_PARAM;
- CA2W tmptitle(m_ProgInfo[i].m_title,CP_UTF8);
- lvi.pszText=tmptitle;
+ lvi.pszText=m_ProgInfo[i].m_title.GetBuffer();
lvi.iItem=0;
lvi.iSubItem=0;
lvi.lParam=i;
@@ -202,22 +201,20 @@
LVITEMW lvSubItem;
lvSubItem.mask=LVIF_TEXT;
- CA2W tmpsubtitle(m_ProgInfo[i].m_subtitle,CP_UTF8);
- lvSubItem.pszText=tmpsubtitle;
+ lvSubItem.pszText=m_ProgInfo[i].m_subtitle.GetBuffer();
lvSubItem.iItem=res;
lvSubItem.iSubItem=1;
res=SendMessage(hList,LVM_SETITEMW,0,(LPARAM)&lvSubItem);
lvSubItem.iSubItem=2;
- CA2W tmpchname(m_ProgInfo[i].m_channame,CP_UTF8);
- lvSubItem.pszText=tmpchname;
+ lvSubItem.pszText=m_ProgInfo[i].m_channame.GetBuffer();
res=SendMessage(hList,LVM_SETITEMW,0,(LPARAM)&lvSubItem);
}
else
{
LVITEMA lvi;
lvi.mask=LVIF_TEXT|LVIF_PARAM;
- lvi.pszText=m_ProgInfo[i].m_title.GetBuffer();
+ lvi.pszText=CW2A(m_ProgInfo[i].m_title.GetBuffer());
lvi.iItem=0;
lvi.iSubItem=0;
lvi.lParam=i;
@@ -225,13 +222,13 @@
LVITEMA lvSubItem;
lvSubItem.mask=LVIF_TEXT;
- lvSubItem.pszText=m_ProgInfo[i].m_subtitle.GetBuffer();
+ lvSubItem.pszText=CW2A(m_ProgInfo[i].m_subtitle.GetBuffer());
lvSubItem.iItem=res;
lvSubItem.iSubItem=1;
res=SendMessage(hList,LVM_SETITEMA,0,(LPARAM)&lvSubItem);
lvSubItem.iSubItem=2;
- lvSubItem.pszText=m_ProgInfo[i].m_channame.GetBuffer();
+ lvSubItem.pszText=CW2A(m_ProgInfo[i].m_channame.GetBuffer());
res=SendMessage(hList,LVM_SETITEMA,0,(LPARAM)&lvSubItem);
}
}
@@ -384,10 +381,10 @@
{
CAtlStringW str;
str.Format(L"Are you sure you want to delete:\n%s: %s recorded at %s on %s",
- (LPWSTR)CA2W(prog.m_title,CP_UTF8),
- (LPWSTR)CA2W(prog.m_subtitle,CP_UTF8),
- (LPWSTR)CA2W(prog.m_recstartts.Format("%Y-%m-%d %H:%M:%S"),CP_UTF8),
- (LPWSTR)CA2W(prog.m_channame,CP_UTF8));
+ (LPWSTR)prog.m_title.GetBuffer(),
+ (LPWSTR)prog.m_subtitle.GetBuffer(),
+ (LPWSTR)prog.m_recstartts.Format("%Y-%m-%d %H:%M:%S").GetBuffer(),
+ (LPWSTR)prog.m_channame.GetBuffer());
if(MessageBoxW(m_hWnd,str.GetBuffer(),L"Delete?",MB_YESNO|MB_ICONQUESTION)==IDYES)
{
CAtlString tmp;
Modified: trunk/MythTVReader/NuvConv/Convert.cpp
===================================================================
--- trunk/MythTVReader/NuvConv/Convert.cpp 2007-07-11 21:02:40 UTC (rev 543)
+++ trunk/MythTVReader/NuvConv/Convert.cpp 2007-07-11 21:10:28 UTC (rev 544)
@@ -261,7 +261,7 @@
if(m_fileinfo.m_ProgramInfo.m_subtitle.GetLength()>0)
{
str+=": ";
- str+=CT2W(m_fileinfo.m_ProgramInfo.m_subtitle);
+ str+=m_fileinfo.m_ProgramInfo.m_subtitle;
}
val=str;
hr=pBag->Write(OLESTR("INFO/INAM"),&val);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
