Browse files

Merge branch 'master' into frodo

  • Loading branch information...
2 parents e9974ff + a112862 commit 5f97406cffb412ac5161c3dc51205caca009fcc7 @opdenkamp committed Dec 30, 2012
View
2 addons/pvr.hts/project/VS2010Express/pvrclient_tvheadend.vcxproj
@@ -78,13 +78,15 @@
<ItemGroup>
<ClCompile Include="..\..\src\CircBuffer.cpp" />
<ClCompile Include="..\..\src\client.cpp" />
+ <ClCompile Include="..\..\src\GUIDialogTranscode.cpp" />
<ClCompile Include="..\..\src\HTSPConnection.cpp" />
<ClCompile Include="..\..\src\HTSPData.cpp" />
<ClCompile Include="..\..\src\HTSPDemux.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\CircBuffer.h" />
<ClInclude Include="..\..\src\client.h" />
+ <ClInclude Include="..\..\src\GUIDialogTranscode.h" />
<ClInclude Include="..\..\src\HTSPConnection.h" />
<ClInclude Include="..\..\src\HTSPData.h" />
<ClInclude Include="..\..\src\HTSPDemux.h" />
View
6 addons/pvr.hts/project/VS2010Express/pvrclient_tvheadend.vcxproj.filters
@@ -30,6 +30,9 @@
<ClCompile Include="..\..\src\CircBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\GUIDialogTranscode.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\client.h">
@@ -50,5 +53,8 @@
<ClInclude Include="..\..\src\CircBuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\GUIDialogTranscode.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
View
2 addons/pvr.hts/src/HTSPDemux.cpp
@@ -175,7 +175,7 @@ DemuxPacket* CHTSPDemux::Read()
void CHTSPDemux::ParseMuxPacket(htsmsg_t *msg)
{
- uint32_t index, duration, frametype;
+ uint32_t index, duration;
const void* bin;
size_t binlen;
int64_t ts;
View
2 addons/pvr.hts/src/client.cpp
@@ -310,7 +310,7 @@ ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue)
{
int bNewValue = *(bool*) settingValue;
XBMC->Log(LOG_INFO, "%s - Changed Setting 'transcode' from %u to %u", __FUNCTION__, g_bTranscode, bNewValue);
- g_bTranscode = bNewValue;
+ g_bTranscode = (bNewValue == 1);
}
else if (str == "resolution")
{

0 comments on commit 5f97406

Please sign in to comment.