[Dsmyth-checkins] SF.net SVN: dsmyth: [545] trunk/MythTVReader
Brought to you by:
tobbej
Menu
▾
▴
[Dsmyth-checkins] SF.net SVN: dsmyth: [545] trunk/MythTVReader
|
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.
|
