24 changes: 24 additions & 0 deletions Win32/VS2010/libs/libmythmetadata/libmythmetadata.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythmetadata\videoutils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythmetadata\bluraymetadata.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythmetadata\metadatafactory.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="$(mythtv_source)\mythtv\libs\libmythmetadata\parentalcontrols.h">
Expand All @@ -82,6 +88,9 @@
<CustomBuild Include="GeneratedFiles\Release\parentalcontrols.moc">
<Filter>Generated Files\Release</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\libs\libmythmetadata\mythuimetadataresults.h">
<Filter>Header Files</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ClCompile Include="GeneratedFiles\Debug\moc_parentalcontrols.cpp">
Expand Down Expand Up @@ -132,5 +141,20 @@
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythmetadata\videoscan.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="bluraymetadata_vs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythmetadata\metadatafactory.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythmetadata\mythuimetadataresults.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_mythuimetadataresults.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_mythuimetadataresults.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Win32/VS2010/libs/libmythsamplerate/libmythsamplerate.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\bin\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(Configuration)\bin\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand Down
108 changes: 94 additions & 14 deletions Win32/VS2010/libs/libmythservicecontracts/libmythservicecontracts.vcxproj
View file

Large diffs are not rendered by default.

45 changes: 45 additions & 0 deletions Win32/VS2010/libs/libmythservicecontracts/libmythservicecontracts.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,21 @@
<CustomBuild Include="$(mythtv_source)\mythtv\libs\libmythservicecontracts\datacontracts\videoMultiplexList.h">
<Filter>Header Files\datacontracts</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\libs\libmythservicecontracts\services\videoServices.h">
<Filter>Header Files\services</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\libs\libmythservicecontracts\datacontracts\videoMetadataInfo.h">
<Filter>Header Files\datacontracts</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\libs\libmythservicecontracts\datacontracts\videoMetadataInfoList.h">
<Filter>Header Files\datacontracts</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\libs\libmythservicecontracts\datacontracts\blurayInfo.h">
<Filter>Header Files\datacontracts</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\libs\libmythservicecontracts\datacontracts\timeZoneInfo.h">
<Filter>Header Files\datacontracts</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythservicecontracts\service.cpp">
Expand Down Expand Up @@ -244,6 +259,36 @@
<ClCompile Include="GeneratedFiles\Release\moc_videoMultiplexList.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_videoServices.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_videoServices.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_videoMetadataInfo.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_videoMetadataInfo.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_videoMetadataInfoList.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_videoMetadataInfoList.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_blurayInfo.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_blurayInfo.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_timeZoneInfo.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_timeZoneInfo.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythservicecontracts\serviceexp.h">
Expand Down
4 changes: 2 additions & 2 deletions Win32/VS2010/libs/libmythsoundtouch/libmythsoundtouch.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\bin\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(Configuration)\bin\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand Down
16 changes: 8 additions & 8 deletions Win32/VS2010/libs/libmythtv/bdringbuffer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "mythevent.h"
#include "iso639.h"
#include "bdringbuffer.h"
#include "mythverbose.h"
#include "mythcorecontext.h"
#include "mythlocale.h"
#include "mythdirs.h"
Expand All @@ -32,13 +31,14 @@ static void file_opened_callback(void* bdr)
{
}

BDRingBuffer::BDRingBuffer(const QString &lfilename)
: bdnav(NULL), m_isHDMVNavigation(false), m_tryHDMVNavigation(false),
m_topMenuSupported(false), m_firstPlaySupported(false),
m_numTitles(0), m_titleChanged(false), m_playerWait(false),
m_ignorePlayerWait(true),
m_stillTime(0), m_stillMode(BLURAY_STILL_NONE),
m_infoLock(QMutex::Recursive), m_mainThread(NULL)
BDRingBuffer::BDRingBuffer(const QString &lfilename)
: bdnav(NULL), m_isHDMVNavigation(false), m_tryHDMVNavigation(false),
m_topMenuSupported(false), m_firstPlaySupported(false),
m_numTitles(0), m_titleChanged(false), m_playerWait(false),
m_ignorePlayerWait(true),
m_stillTime(0), m_stillMode(BLURAY_STILL_NONE),
m_infoLock(QMutex::Recursive), m_mainThread(NULL),
RingBuffer( kRingBuffer_BD )
{
}

Expand Down
31 changes: 29 additions & 2 deletions Win32/VS2010/libs/libmythtv/dvdringbuffer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

#include "mythdvdplayer.h"
#include "compat.h"
#include "mythverbose.h"
#include "mythuihelper.h"

#define LOC QString("DVDRB: ")
Expand Down Expand Up @@ -70,7 +69,8 @@ DVDRingBuffer::DVDRingBuffer(const QString &lfilename) :

// Menu/buttons
m_inMenu(false), m_buttonVersion(1), m_buttonStreamID(0),
m_hl_button(0, 0, 0, 0), m_menuSpuPkt(0), m_menuBuflength(0)
m_hl_button(0, 0, 0, 0), m_menuSpuPkt(0), m_menuBuflength(0),
RingBuffer( kRingBuffer_DVD )
{

}
Expand All @@ -83,6 +83,11 @@ void DVDRingBuffer::CloseDVD(void)
{
}

bool DVDRingBuffer::IsBookmarkAllowed( void )
{
return false;
}

long long DVDRingBuffer::Seek(long long pos, int whence, bool has_lock)
{
return -1;
Expand Down Expand Up @@ -427,3 +432,25 @@ bool DVDRingBuffer::NewSequence(bool new_sequence)
{
return false;
}

void DVDRingBuffer::GetChapterTimes(QList<long long> &times)
{
}

bool DVDRingBuffer::playTrack(int track)
{
return false;
}

DVDInfo::DVDInfo(const QString &filename)
{
}

DVDInfo::~DVDInfo(void)
{
}

bool DVDInfo::GetNameAndSerialNum(QString &name, QString &serialnum)
{
return false;
}
78 changes: 78 additions & 0 deletions Win32/VS2010/libs/libmythtv/ffmpeghack.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
#include <stdint.h>

// This file is a hack to get mythtv to link.
//
// The problem is that the exported const arrays in libmythavcodec.dll
// don't seem to be found when linking even though they are listed
// when calling dumpbin /exports on the dll.
//
// Until the correct approach is found to fix this, the simple fix is
// to redefine the variables here.

const uint8_t ff_golomb_vlc_len[512]={
19,17,15,15,13,13,13,13,11,11,11,11,11,11,11,11,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
};

const uint8_t ff_ue_golomb_vlc_code[512]={
32,32,32,32,32,32,32,32,31,32,32,32,32,32,32,32,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,
7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,11,11,11,11,12,12,12,12,13,13,13,13,14,14,14,14,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};

const int8_t ff_se_golomb_vlc_code[512]={
17, 17, 17, 17, 17, 17, 17, 17, 16, 17, 17, 17, 17, 17, 17, 17, 8, -8, 9, -9, 10,-10, 11,-11, 12,-12, 13,-13, 14,-14, 15,-15,
4, 4, 4, 4, -4, -4, -4, -4, 5, 5, 5, 5, -5, -5, -5, -5, 6, 6, 6, 6, -6, -6, -6, -6, 7, 7, 7, 7, -7, -7, -7, -7,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
};

const uint8_t ff_log2_tab[256]={
0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
};
28 changes: 23 additions & 5 deletions Win32/VS2010/libs/libmythtv/libmythtv.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,16 @@
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythtv\privatedecoder.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythtv\programdata.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythtv\programdetail.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythtv\recorderbase.h" />
<CustomBuild Include="$(mythtv_source)\mythtv\libs\libmythtv\recorderbase.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DMTV_API -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_SQL_LIB -DQT_OPENGL_LIB -DQT_NETWORK_LIB -DQT_WEBKIT_LIB -DLIBMYTH_LIB -DUSING_OPENGL -DUSING_MINGW -DUSING_BACKEND -DUSE_OPENGL_PAINTER -DUSING_MHEG -DRUNPREFIX=\"../\" -DLIBDIRNAME=\"lib\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DPIC -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -D_WINDOWS -D_GNU_SOURCE -DQT_THREAD_SUPPORT -DQT_DLL -D_WINDLL "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtXml" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtWebKit" "-I$(SolutionDir)\." "-I$(SolutionDir)compat\include" "-I$(SolutionDir)libs" "-I$(SolutionDir)libs\libmythbase" "-I$(SolutionDir)libs\libmythtv" "-I$(SolutionDir)libs\libmythfreemheg" "-I$(mythtv_source)\mythtv\libs\libmythbase" "-I$(mythtv_source)\mythtv\libs\libmythupnp" "-I$(mythtv_source)\mythtv\libs\libmythui" "-I$(mythtv_source)\mythtv\libs\libmyth" "-I$(mythtv_source)\mythtv\libs\libmyth\audio" "-I$(mythtv_source)\mythtv\libs\libmythtv" "-I$(mythtv_source)\mythtv\libs\libmythtv\channelscan" "-I$(mythtv_source)\mythtv\libs\libmythtv\iptv" "-I$(mythtv_source)\mythtv\libs\libmythtv\mpeg" "-I$(mythtv_source)\mythtv\libs\libmythsamplerate" "-I$(mythtv_source)\mythtv\libs\libmythsoundtouch" "-I$(mythtv_source)\mythtv\libs\libmythfreesurround" "-I$(mythtv_source)\mythtv\libs\libmythdvdnav" "-I$(mythtv_source)\mythtv\libs\libmythbluray" "-I$(mythtv_source)\mythtv\libs\libmythmetadata" "-I$(mythtv_source)\mythtv\libs\libmythservicecontracts" "-I$(mythtv_source)\mythtv\libs\libmythhdhomerun" "-I$(mythtv_source)\mythtv\libs" "-I$(SolutionDir)thirdparty\zlib\include" "-I$(SolutionDir)thirdparty\pthreads\include" "-I$(SolutionDir)thirdparty\opengl\include" "-I$(SolutionDir)thirdparty\freetype\include" "-I$(SolutionDir)thirdparty\freetype\include\freetype2" "-I$(SolutionDir)thirdparty" "-I$(mythtv_source)\mythtv\external\FFmpeg" "-I$(NOINHERIT)\." "-I." "-I." "-I." "-I."</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DMTV_API -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_SQL_LIB -DQT_OPENGL_LIB -DQT_NETWORK_LIB -DQT_WEBKIT_LIB -DLIBMYTH_LIB -DUSING_OPENGL -DUSING_MINGW -DUSING_BACKEND -DUSE_OPENGL_PAINTER -DUSING_MHEG -DRUNPREFIX=\"../\" -DLIBDIRNAME=\"lib\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DPIC -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -D_WINDOWS -D_GNU_SOURCE -DQT_THREAD_SUPPORT -DQT_DLL -D_WINDLL "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtXml" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtWebKit" "-I." "-I$(SolutionDir)\." "-I$(SolutionDir)compat\include" "-I$(SolutionDir)libs" "-I$(SolutionDir)libs\libmythbase" "-I$(SolutionDir)libs\libmythtv" "-I$(SolutionDir)libs\libmythfreemheg" "-I$(mythtv_source)\mythtv\libs\libmythbase" "-I$(mythtv_source)\mythtv\libs\libmythupnp" "-I$(mythtv_source)\mythtv\libs\libmythui" "-I$(mythtv_source)\mythtv\libs\libmyth" "-I$(mythtv_source)\mythtv\libs\libmyth\audio" "-I$(mythtv_source)\mythtv\libs\libmythtv" "-I$(mythtv_source)\mythtv\libs\libmythtv\channelscan" "-I$(mythtv_source)\mythtv\libs\libmythtv\iptv" "-I$(mythtv_source)\mythtv\libs\libmythtv\mpeg" "-I$(mythtv_source)\mythtv\libs\libmythsamplerate" "-I$(mythtv_source)\mythtv\libs\libmythsoundtouch" "-I$(mythtv_source)\mythtv\libs\libmythfreesurround" "-I$(mythtv_source)\mythtv\libs\libmythdvdnav" "-I$(mythtv_source)\mythtv\libs\libmythbluray" "-I$(mythtv_source)\mythtv\libs\libmythmetadata" "-I$(mythtv_source)\mythtv\libs\libmythservicecontracts" "-I$(mythtv_source)\mythtv\libs\libmythhdhomerun" "-I$(mythtv_source)\mythtv\libs" "-I$(SolutionDir)thirdparty\zlib\include" "-I$(SolutionDir)thirdparty\pthreads\include" "-I$(SolutionDir)thirdparty\opengl\include" "-I$(SolutionDir)thirdparty\freetype\include" "-I$(SolutionDir)thirdparty\freetype\include\freetype2" "-I$(SolutionDir)thirdparty" "-I$(mythtv_source)\mythtv\external\FFmpeg" "-I$(NOINHERIT)\." "-I." "-I." "-I." "-I."</Command>
</CustomBuild>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythtv\recordinginfo.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythtv\recordingrule.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythtv\remoteencoder.h" />
Expand Down Expand Up @@ -500,7 +509,6 @@
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythtv\cc708reader.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythtv\cc708window.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythtv\channelbase.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythtv\channelchangemonitor.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythtv\channelgroup.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythtv\channelgroupsettings.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythtv\channelscan\channelimporter.cpp" />
Expand Down Expand Up @@ -650,6 +658,7 @@
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythtv\tv_play_win.cpp" />
<ClCompile Include="bdringbuffer.cpp" />
<ClCompile Include="dvdringbuffer.cpp" />
<ClCompile Include="ffmpeghack.c" />
<ClCompile Include="GeneratedFiles\Debug\moc_channelgroupsettings.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
Expand Down Expand Up @@ -716,6 +725,9 @@
<ClCompile Include="GeneratedFiles\Debug\moc_profilegroup.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_recorderbase.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_recordingprofile.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
Expand Down Expand Up @@ -815,6 +827,9 @@
<ClCompile Include="GeneratedFiles\Release\moc_profilegroup.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_recorderbase.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_recordingprofile.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ClCompile>
Expand Down Expand Up @@ -884,8 +899,8 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\bin\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(Configuration)\bin\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand All @@ -901,7 +916,10 @@
<OutputFile>$(OutDir)\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>Winmm.lib;mythbase.lib;mythupnp.lib;mythui.lib;myth.lib;mythfreesurround.lib;mythsamplerate.lib;mythsoundtouch.lib;mythfreemheg.lib;libmythavcodec.lib;libmythavcore.lib;libmythavutil.lib;libmythavformat.lib;libmythswscale.lib;freetype.lib;pthreadVC2.lib;QtCored4.lib;QtGuid4.lib;QtXmld4.lib;QtSqld4.lib;QtOpenGLd4.lib;opengl32.lib;glu32.lib;QtNetworkd4.lib;QtWebKitd4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Winmm.lib;libmythavcodec.lib;mythbase.lib;mythupnp.lib;mythui.lib;myth.lib;mythfreesurround.lib;mythsamplerate.lib;mythsoundtouch.lib;mythfreemheg.lib;libmythavutil.lib;libmythavformat.lib;libmythswscale.lib;freetype.lib;pthreadVC2.lib;QtCored4.lib;QtGuid4.lib;QtXmld4.lib;QtSqld4.lib;QtOpenGLd4.lib;opengl32.lib;glu32.lib;QtNetworkd4.lib;QtWebKitd4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ForceFileOutput>
</ForceFileOutput>
<ShowProgress>NotSet</ShowProgress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand Down
18 changes: 12 additions & 6 deletions Win32/VS2010/libs/libmythtv/libmythtv.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,9 +377,6 @@
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythtv\programdetail.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythtv\recorderbase.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythtv\recordinginfo.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -595,6 +592,9 @@
<CustomBuild Include="$(mythtv_source)\mythtv\libs\libmythtv\signalmonitor.h">
<Filter>Header Files</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\libs\libmythtv\recorderbase.h">
<Filter>Header Files</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ClCompile Include="GeneratedFiles\Debug\moc_channelscanner_gui.cpp">
Expand Down Expand Up @@ -882,9 +882,6 @@
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythtv\channelbase.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythtv\channelchangemonitor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythtv\channelgroup.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -1263,5 +1260,14 @@
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythtv\visualisations\videovisual.cpp">
<Filter>Source Files\visualisations</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_recorderbase.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_recorderbase.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="ffmpeghack.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Win32/VS2010/libs/libmythui/libmythui.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,8 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\bin\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(Configuration)\bin\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand Down
14 changes: 9 additions & 5 deletions Win32/VS2010/libs/libmythupnp/libmythupnp.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,11 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\broadcast.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\bufferedsocketdevice.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\configuration.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\eventing.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\httprequest.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\mmembuf.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\multicast.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\mythxmlclient.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\refcounted.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\soapclient.h" />
Expand All @@ -43,6 +41,10 @@
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\servicehost.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\wsdl.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\htmlserver.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\mbroadcastsocketdevice.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\mmulticastsocketdevice.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\upnpserviceimpl.h" />
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\upnpsubscription.h" />
<CustomBuild Include="$(mythtv_source)\mythtv\libs\libmythupnp\serverSideScripting.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing %(Identity)...</Message>
Expand Down Expand Up @@ -107,7 +109,6 @@
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\upnptasknotify.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\upnptasksearch.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\upnputil.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\multicast.cpp" />
<ClCompile Include="GeneratedFiles\Debug\moc_httpserver.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
Expand Down Expand Up @@ -139,6 +140,9 @@
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\wsdl.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\htmlserver.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\serverSideScripting.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\mmulticastsocketdevice.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\upnpserviceimpl.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\upnpsubscription.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{F0EE3ABC-B1DA-45FB-A453-A0F4ED35769D}</ProjectGuid>
Expand Down Expand Up @@ -174,8 +178,8 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\bin\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(Configuration)\bin\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand Down
30 changes: 21 additions & 9 deletions Win32/VS2010/libs/libmythupnp/libmythupnp.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\broadcast.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\bufferedsocketdevice.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand All @@ -50,9 +47,6 @@
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\mmembuf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\multicast.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\mythxmlclient.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -128,6 +122,18 @@
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\htmlserver.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\mbroadcastsocketdevice.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\mmulticastsocketdevice.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\upnpserviceimpl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\libs\libmythupnp\upnpsubscription.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="$(mythtv_source)\mythtv\libs\libmythupnp\threadpool.h">
Expand Down Expand Up @@ -228,9 +234,6 @@
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\upnputil.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\multicast.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\serializers\jsonSerializer.cpp">
<Filter>Source Files\serializers</Filter>
</ClCompile>
Expand Down Expand Up @@ -258,5 +261,14 @@
<ClCompile Include="GeneratedFiles\Release\moc_serverSideScripting.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\mmulticastsocketdevice.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\upnpserviceimpl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\libs\libmythupnp\upnpsubscription.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Win32/VS2010/mythtv.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat\include;$(SolutionDir)libs;$(SolutionDir)libs\libmythbase;$(SolutionDir)libs\libmythtv;$(SolutionDir)libs\libmythfreemheg;$(mythtv_source)\mythtv\libs\libmythbase;$(mythtv_source)\mythtv\libs\libmythupnp;$(mythtv_source)\mythtv\libs\libmythui;$(mythtv_source)\mythtv\libs\libmyth;$(mythtv_source)\mythtv\libs\libmyth\audio;$(mythtv_source)\mythtv\libs\libmythtv;$(mythtv_source)\mythtv\libs\libmythtv\channelscan;$(mythtv_source)\mythtv\libs\libmythtv\iptv;$(mythtv_source)\mythtv\libs\libmythtv\mpeg;$(mythtv_source)\mythtv\libs\libmythsamplerate;$(mythtv_source)\mythtv\libs\libmythsoundtouch;$(mythtv_source)\mythtv\libs\libmythfreesurround;$(mythtv_source)\mythtv\libs\libmythdvdnav;$(mythtv_source)\mythtv\libs\libmythbluray;$(mythtv_source)\mythtv\libs\libmythmetadata;$(mythtv_source)\mythtv\libs\libmythservicecontracts;$(mythtv_source)\mythtv\libs\libmythhdhomerun;$(mythtv_source)\mythtv\libs;$(SolutionDir)thirdparty\zlib\include;$(SolutionDir)thirdparty\pthreads\include;$(SolutionDir)thirdparty\opengl\include;$(SolutionDir)thirdparty\freetype\include;$(SolutionDir)thirdparty\freetype\include\freetype2;$(SolutionDir)thirdparty;$(mythtv_source)\mythtv\external\FFmpeg;$(QTDIR)\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USING_OPENGL;USING_MINGW;USING_BACKEND;USE_OPENGL_PAINTER;USING_MHEG;RUNPREFIX=".";LIBDIRNAME="lib";_FILE_OFFSET_BITS=64;_LARGEFILE_SOURCE;QT_LARGEFILE_SUPPORT;PIC;__STDC_CONSTANT_MACROS;__STDC_LIMIT_MACROS;_WINDOWS;WIN32;_GNU_SOURCE;QT_THREAD_SUPPORT;QT_DLL;QT_SQL_LIB;QT_XML_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USING_OPENGL;USING_MINGW;USING_BACKEND;USE_OPENGL_PAINTER;USING_MHEG;RUNPREFIX="../";LIBDIRNAME="lib";_FILE_OFFSET_BITS=64;_LARGEFILE_SOURCE;QT_LARGEFILE_SUPPORT;PIC;__STDC_CONSTANT_MACROS;__STDC_LIMIT_MACROS;_WINDOWS;WIN32;_GNU_SOURCE;QT_THREAD_SUPPORT;QT_DLL;QT_SQL_LIB;QT_XML_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>
</RuntimeLibrary>
<ForcedIncludeFiles>$(SolutionDir)config.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
Expand Down
64 changes: 42 additions & 22 deletions Win32/VS2010/programs/mythbackend/mythbackend.vcxproj
View file

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions Win32/VS2010/programs/mythbackend/mythbackend.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@
<CustomBuild Include="$(mythtv_source)\mythtv\programs\mythbackend\services\channel.h">
<Filter>Header Files\services</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\programs\mythbackend\services\video.h">
<Filter>Header Files\services</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ClCompile Include="GeneratedFiles\Debug\moc_autoexpire.cpp">
Expand Down Expand Up @@ -214,6 +217,18 @@
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythbackend\services\channel.cpp">
<Filter>Source Files\services</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythbackend\services\video.cpp">
<Filter>Source Files\services</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_video.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_video.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythbackend\commandlineparser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythbackend\backendcontext.h">
Expand Down Expand Up @@ -276,5 +291,11 @@
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythbackend\serviceHosts\channelServiceHost.h">
<Filter>Header Files\serviceHosts</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythbackend\serviceHosts\videoServiceHost.h">
<Filter>Header Files\serviceHosts</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythbackend\commandlineparser.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
4 changes: 3 additions & 1 deletion Win32/VS2010/programs/mythfilldatabase/mythfilldatabase.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\fillutil.h" />
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\icondata.h" />
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\xmltvparser.h" />
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\commandlineparser.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\channeldata.cpp" />
Expand All @@ -24,6 +25,7 @@
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\icondata.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\main.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\xmltvparser.cpp" />
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\commandlineparser.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{050EA05F-BC2E-409A-9E6F-43DD7BDE5845}</ProjectGuid>
Expand Down Expand Up @@ -58,7 +60,7 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\bin\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(ConfigurationName)</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand Down
6 changes: 6 additions & 0 deletions Win32/VS2010/programs/mythfilldatabase/mythfilldatabase.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\xmltvparser.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\commandlineparser.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\channeldata.cpp">
Expand All @@ -56,5 +59,8 @@
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\xmltvparser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfilldatabase\commandlineparser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
282 changes: 221 additions & 61 deletions Win32/VS2010/programs/mythfrontend/mythfrontend.vcxproj
View file

Large diffs are not rendered by default.

120 changes: 120 additions & 0 deletions Win32/VS2010/programs/mythfrontend/mythfrontend.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,18 @@
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythfrontend\programinfocache.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythfrontend\videoglobalsettings.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythfrontend\videoplayercommand.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythfrontend\videolist.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythfrontend\commandlineparser.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="$(mythtv_source)\mythtv\programs\mythfrontend\audiogeneralsettings.h">
Expand Down Expand Up @@ -147,6 +159,39 @@
<CustomBuild Include="$(mythtv_source)\mythtv\programs\mythfrontend\viewschedulediff.h">
<Filter>Header Files</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\programs\mythfrontend\videofileassoc.h">
<Filter>Header Files</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\programs\mythfrontend\videometadatasettings.h">
<Filter>Header Files</Filter>
</CustomBuild>
<CustomBuild Include="GeneratedFiles\Debug\videodlg.moc">
<Filter>Generated Files\Debug</Filter>
</CustomBuild>
<CustomBuild Include="GeneratedFiles\Release\videodlg.moc">
<Filter>Generated Files\Release</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\programs\mythfrontend\videodlg.h">
<Filter>Header Files</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\programs\mythfrontend\videoplayersettings.h">
<Filter>Header Files</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\programs\mythfrontend\videopopups.h">
<Filter>Header Files</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\programs\mythfrontend\videofilter.h">
<Filter>Header Files</Filter>
</CustomBuild>
<CustomBuild Include="GeneratedFiles\Debug\editvideometadata.moc">
<Filter>Generated Files\Debug</Filter>
</CustomBuild>
<CustomBuild Include="GeneratedFiles\Release\editvideometadata.moc">
<Filter>Generated Files\Release</Filter>
</CustomBuild>
<CustomBuild Include="$(mythtv_source)\mythtv\programs\mythfrontend\editvideometadata.h">
<Filter>Header Files</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ClCompile Include="GeneratedFiles\Debug\moc_audiogeneralsettings.cpp">
Expand Down Expand Up @@ -443,6 +488,81 @@
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfrontend\viewschedulediff.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfrontend\videofileassoc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_videofileassoc.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_videofileassoc.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfrontend\videometadatasettings.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_videometadatasettings.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_videometadatasettings.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfrontend\videoglobalsettings.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_videodlg.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_videodlg.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfrontend\videodlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfrontend\videoplayercommand.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfrontend\videoplayersettings.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_videoplayersettings.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_videoplayersettings.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfrontend\videopopups.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_videopopups.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_videopopups.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfrontend\videolist.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfrontend\commandlineparser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfrontend\videofilter.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_videofilter.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_videofilter.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_editvideometadata.cpp">
<Filter>Generated Files\Debug</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_editvideometadata.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythfrontend\editvideometadata.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="$(mythtv_source)\mythtv\programs\mythfrontend\mythfrontend.icns">
Expand Down
22 changes: 12 additions & 10 deletions Win32/VS2010/programs/mythtv-setup/mythtv-setup.vcxproj
View file

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions Win32/VS2010/programs/mythtv-setup/mythtv-setup.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythtv-setup\checksetup.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(mythtv_source)\mythtv\programs\mythtv-setup\commandlineparser.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="$(mythtv_source)\mythtv\programs\mythtv-setup\channeleditor.h">
Expand Down Expand Up @@ -102,5 +105,8 @@
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythtv-setup\startprompt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(mythtv_source)\mythtv\programs\mythtv-setup\commandlineparser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>