Skip to content

Commit

Permalink
Merge branch 'master' into pvr-ppa
Browse files Browse the repository at this point in the history
  • Loading branch information
@opdenkamp
opdenkamp committed Apr 25, 2011
2 parents 3513480 + 2d3b069 commit f44db35
Show file tree
Hide file tree
Showing 130 changed files with 6,660 additions and 6,204 deletions.
8 changes: 0 additions & 8 deletions addons/skin.confluence/720p/MyPVR.xml
View file
Expand Up @@ -189,15 +189,7 @@
<include>ButtonCommonValues</include>
<label>137</label>
</control>
<control type="button" id="610">
<description>Fake Button to fix Player Controls Navigation</description>
<visible>false</visible>
</control>
<include>CommonNowPlaying_Controls</include>
<control type="button" id="611">
<description>Fake Button to fix Player Controls Navigation</description>
<visible>false</visible>
</control>
</control>
</control>

Expand Down
6 changes: 5 additions & 1 deletion addons/skin.confluence/720p/includes.xml
View file
Expand Up @@ -503,9 +503,13 @@
<visible>[Player.HasAudio | Player.HasVideo]</visible>
<include>VisibleFadeEffect</include>
</control>
<control type="button" id="610">
<description>Fake Button to fix Player Controls Navigation</description>
<visible>false</visible>
</control>
<control type="group" id="9006">
<width>250</width>
<height>39</height>
<height>45</height>
<visible>VideoPlayer.Content(LiveTV)</visible>
<include>VisibleFadeEffect</include>
<control type="button" id="600">
Expand Down
3 changes: 3 additions & 0 deletions language/Dutch/strings.xml
View file
Expand Up @@ -1627,6 +1627,9 @@
<string id="19226">Opname gestart</string>
<string id="19227">Opname voltooid</string>
<string id="19228">Opname verwijderd</string>
<string id="19229">Sluit kanelen OSD na wijzigen kanaal</string>
<string id="19230">Geen EPG updates tijdens het afspelen van een TV stream</string>
<string id="19231">Gebruik altijd de volgorde van kanalen van backend(s)</string>

<string id="19499">Anders/Onbekend</string>
<string id="19500">Film/Drama</string>
Expand Down
3 changes: 3 additions & 0 deletions language/English/strings.xml
View file
Expand Up @@ -1755,6 +1755,9 @@
<string id="19226">Recording started</string>
<string id="19227">Recording completed</string>
<string id="19228">Recording deleted</string>
<string id="19229">Close channel OSD after switching channels</string>
<string id="19230">Prevent EPG updates while playing a TV stream</string>
<string id="19231">Always use the channel order from the backend(s)</string>

<string id="19499">Other/Unknown</string>
<string id="19500">Movie/Drama</string>
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp
View file
Expand Up @@ -143,7 +143,7 @@ DLLEXPORT void PVR_trigger_recording_update()
if (m_cb == NULL)
return;

m_cb->TriggerTimerUpdate(m_Handle->addonData);
m_cb->TriggerRecordingUpdate(m_Handle->addonData);
}

DLLEXPORT void PVR_free_demux_packet(DemuxPacket* pPacket)
Expand Down
4 changes: 2 additions & 2 deletions project/VS2010Express/XBMC.vcxproj
View file
Expand Up @@ -347,6 +347,7 @@
<ClCompile Include="..\..\xbmc\epg\EpgDatabase.cpp" />
<ClCompile Include="..\..\xbmc\epg\EpgInfoTag.cpp" />
<ClCompile Include="..\..\xbmc\epg\EpgSearchFilter.cpp" />
<ClCompile Include="..\..\xbmc\epg\GUIEPGGridContainer.cpp" />
<ClCompile Include="..\..\xbmc\Favourites.cpp" />
<ClCompile Include="..\..\xbmc\FileItem.cpp" />
<ClCompile Include="..\..\xbmc\filesystem\CacheCircular.cpp" />
Expand Down Expand Up @@ -382,7 +383,6 @@
<ClCompile Include="..\..\xbmc\guilib\GUIControlProfiler.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIDialog.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIEditControl.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIEPGGridContainer.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIFadeLabelControl.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIFixedListContainer.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIFont.cpp" />
Expand Down Expand Up @@ -1279,6 +1279,7 @@
<ClInclude Include="..\..\xbmc\epg\EpgDatabase.h" />
<ClInclude Include="..\..\xbmc\epg\EpgInfoTag.h" />
<ClInclude Include="..\..\xbmc\epg\EpgSearchFilter.h" />
<ClInclude Include="..\..\xbmc\epg\GUIEPGGridContainer.h" />
<ClInclude Include="..\..\xbmc\Favourites.h" />
<ClInclude Include="..\..\xbmc\FileItem.h" />
<ClInclude Include="..\..\xbmc\filesystem\CacheCircular.h" />
Expand Down Expand Up @@ -1331,7 +1332,6 @@
<ClInclude Include="..\..\xbmc\guilib\GUIControlProfiler.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIDialog.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIEditControl.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIEPGGridContainer.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIFadeLabelControl.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIFixedListContainer.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIFont.h" />
Expand Down
14 changes: 7 additions & 7 deletions project/VS2010Express/XBMC.vcxproj.filters
View file
Expand Up @@ -2477,9 +2477,6 @@
<ClCompile Include="..\..\xbmc\utils\TextSearch.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\guilib\GUIEPGGridContainer.cpp">
<Filter>guilib</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\utils\GLUtils.cpp">
<Filter>utils</Filter>
</ClCompile>
Expand Down Expand Up @@ -2643,6 +2640,9 @@
<ClCompile Include="..\..\xbmc\filesystem\CacheCircular.cpp">
<Filter>filesystem</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\epg\GUIEPGGridContainer.cpp">
<Filter>epg</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\xbmc\win32\pch.h">
Expand Down Expand Up @@ -5095,9 +5095,6 @@
<ClInclude Include="..\..\xbmc\utils\TextSearch.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\guilib\GUIEPGGridContainer.h">
<Filter>guilib</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\utils\GLUtils.h">
<Filter>utils</Filter>
</ClInclude>
Expand Down Expand Up @@ -5256,6 +5253,9 @@
<ClInclude Include="..\..\xbmc\interfaces\json-rpc\InputOperations.h">
<Filter>interfaces\json-rpc</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\epg\GUIEPGGridContainer.h">
<Filter>epg</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\xbmc\win32\XBMC.ico">
Expand All @@ -5272,4 +5272,4 @@
<Filter>win32</Filter>
</CustomBuild>
</ItemGroup>
</Project>
</Project>
1 change: 1 addition & 0 deletions xbmc/Application.cpp
View file
Expand Up @@ -304,6 +304,7 @@ using namespace DBUSSERVER;
using namespace JSONRPC;
#endif
using namespace ANNOUNCEMENT;
using namespace PVR;

// uncomment this if you want to use release libs in the debug build.
// Atm this saves you 7 mb of memory
Expand Down
2 changes: 2 additions & 0 deletions xbmc/FileItem.cpp
View file
Expand Up @@ -66,6 +66,8 @@ using namespace std;
using namespace XFILE;
using namespace PLAYLIST;
using namespace MUSIC_INFO;
using namespace PVR;
using namespace EPG;

CFileItem::CFileItem(const CSong& song)
{
Expand Down
50 changes: 28 additions & 22 deletions xbmc/FileItem.h
View file
Expand Up @@ -42,11 +42,17 @@ namespace MUSIC_INFO
class CMusicInfoTag;
}
class CVideoInfoTag;
class CEpgInfoTag;
class CPVREpgInfoTag;
class CPVRChannel;
class CPVRRecording;
class CPVRTimerInfoTag;
namespace EPG
{
class CEpgInfoTag;
}
namespace PVR
{
class CPVREpgInfoTag;
class CPVRChannel;
class CPVRRecording;
class CPVRTimerInfoTag;
}
class CPictureInfoTag;

class CAlbum;
Expand Down Expand Up @@ -79,11 +85,11 @@ class CFileItem :
CFileItem(const CArtist& artist);
CFileItem(const CGenre& genre);
CFileItem(const CVideoInfoTag& movie);
CFileItem(const CPVREpgInfoTag& tag);
CFileItem(const CEpgInfoTag& tag);
CFileItem(const CPVRChannel& channel);
CFileItem(const CPVRRecording& record);
CFileItem(const CPVRTimerInfoTag& timer);
CFileItem(const PVR::CPVREpgInfoTag& tag);
CFileItem(const EPG::CEpgInfoTag& tag);
CFileItem(const PVR::CPVRChannel& channel);
CFileItem(const PVR::CPVRRecording& record);
CFileItem(const PVR::CPVRTimerInfoTag& timer);
CFileItem(const CMediaSource& share);
virtual ~CFileItem(void);
virtual CGUIListItem *Clone() const { return new CFileItem(*this); };
Expand Down Expand Up @@ -199,9 +205,9 @@ class CFileItem :
return m_epgInfoTag != NULL;
}

CEpgInfoTag* GetEPGInfoTag();
EPG::CEpgInfoTag* GetEPGInfoTag();

inline const CEpgInfoTag* GetEPGInfoTag() const
inline const EPG::CEpgInfoTag* GetEPGInfoTag() const
{
return m_epgInfoTag;
}
Expand All @@ -211,9 +217,9 @@ class CFileItem :
return m_pvrChannelInfoTag != NULL;
}

CPVRChannel* GetPVRChannelInfoTag();
PVR::CPVRChannel* GetPVRChannelInfoTag();

inline const CPVRChannel* GetPVRChannelInfoTag() const
inline const PVR::CPVRChannel* GetPVRChannelInfoTag() const
{
return m_pvrChannelInfoTag;
}
Expand All @@ -223,9 +229,9 @@ class CFileItem :
return m_pvrRecordingInfoTag != NULL;
}

CPVRRecording* GetPVRRecordingInfoTag();
PVR::CPVRRecording* GetPVRRecordingInfoTag();

inline const CPVRRecording* GetPVRRecordingInfoTag() const
inline const PVR::CPVRRecording* GetPVRRecordingInfoTag() const
{
return m_pvrRecordingInfoTag;
}
Expand All @@ -235,9 +241,9 @@ class CFileItem :
return m_pvrTimerInfoTag != NULL;
}

CPVRTimerInfoTag* GetPVRTimerInfoTag();
PVR::CPVRTimerInfoTag* GetPVRTimerInfoTag();

inline const CPVRTimerInfoTag* GetPVRTimerInfoTag() const
inline const PVR::CPVRTimerInfoTag* GetPVRTimerInfoTag() const
{
return m_pvrTimerInfoTag;
}
Expand Down Expand Up @@ -368,10 +374,10 @@ class CFileItem :
CStdString m_extrainfo;
MUSIC_INFO::CMusicInfoTag* m_musicInfoTag;
CVideoInfoTag* m_videoInfoTag;
CEpgInfoTag* m_epgInfoTag;
CPVRChannel* m_pvrChannelInfoTag;
CPVRRecording* m_pvrRecordingInfoTag;
CPVRTimerInfoTag * m_pvrTimerInfoTag;
EPG::CEpgInfoTag* m_epgInfoTag;
PVR::CPVRChannel* m_pvrChannelInfoTag;
PVR::CPVRRecording* m_pvrRecordingInfoTag;
PVR::CPVRTimerInfoTag * m_pvrTimerInfoTag;
CPictureInfoTag* m_pictureInfoTag;
bool m_bIsAlbum;
};
Expand Down
2 changes: 1 addition & 1 deletion xbmc/GUIInfoManager.cpp
View file
Expand Up @@ -79,7 +79,6 @@
#include "pvr/channels/PVRChannelGroupsContainer.h"
#include "pvr/epg/PVREpgInfoTag.h"
#include "pvr/timers/PVRTimers.h"
#include "pvr/timers/PVRTimerInfoTag.h"
#include "pvr/recordings/PVRRecording.h"

#include "addons/AddonManager.h"
Expand All @@ -90,6 +89,7 @@ using namespace std;
using namespace XFILE;
using namespace MUSIC_INFO;
using namespace ADDON;
using namespace PVR;

CGUIInfoManager::CCombinedValue& CGUIInfoManager::CCombinedValue::operator =(const CGUIInfoManager::CCombinedValue& mSrc)
{
Expand Down
1 change: 1 addition & 0 deletions xbmc/GUIViewState.cpp
View file
Expand Up @@ -48,6 +48,7 @@

using namespace std;
using namespace ADDON;
using namespace PVR;

CStdString CGUIViewState::m_strPlaylistDirectory;
VECSOURCES CGUIViewState::m_sources;
Expand Down
3 changes: 2 additions & 1 deletion xbmc/SortFileItem.cpp
View file
Expand Up @@ -23,7 +23,6 @@
#include "video/VideoInfoTag.h"
#include "pvr/channels/PVRChannel.h"
#include "pvr/epg/PVREpg.h"
#include "pvr/epg/PVREpgInfoTag.h"
#include "pvr/timers/PVRTimerInfoTag.h"
#include "settings/AdvancedSettings.h"
#include "utils/StringUtils.h"
Expand All @@ -33,6 +32,8 @@
#include "utils/log.h"
#include "video/VideoInfoTag.h"

using namespace PVR;

#define RETURN_IF_NULL(x,y) if ((x) == NULL) { CLog::Log(LOGWARNING, "%s, sort item is null", __FUNCTION__); return y; }

CStdString SSortFileItem::RemoveArticles(const CStdString &label)
Expand Down
2 changes: 2 additions & 0 deletions xbmc/addons/AddonCallbacksPVR.cpp
View file
Expand Up @@ -33,6 +33,8 @@
#include "pvr/timers/PVRTimers.h"
#include "pvr/timers/PVRTimerInfoTag.h"

using namespace PVR;

namespace ADDON
{

Expand Down
1 change: 1 addition & 0 deletions xbmc/addons/AddonManager.cpp
View file
Expand Up @@ -50,6 +50,7 @@
#include "Service.h"

using namespace std;
using namespace PVR;

namespace ADDON
{
Expand Down
4 changes: 3 additions & 1 deletion xbmc/addons/include/xbmc_pvr_types.h
View file
Expand Up @@ -77,7 +77,9 @@ struct DemuxPacket;
#define EPG_EVENT_CONTENTMASK_USERDEFINED 0xF0
//@}

#define PVR_STREAM_MAX_STREAMS 16

/* using the default avformat's MAX_STREAMS value to be safe */
#define PVR_STREAM_MAX_STREAMS 20

#ifdef __cplusplus
extern "C" {
Expand Down

0 comments on commit f44db35

Please sign in to comment.