Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement series/episode/eptitle for recordings #58

Merged
merged 1 commit into from
Jan 5, 2018
Merged

Implement series/episode/eptitle for recordings #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions pvr.demo/PVRDemoAddonSettings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@
<!-- TV Recordings -->
<recording>
<title>Demo TV Recording entry 1</title>
<episodetitle>Demo TV Recording 1 Episode Name</episodetitle>
<url>http://distribution.bbb3d.renderfarming.net/video/mp4/bbb_sunflower_1080p_30fps_normal.mp4</url>
<directory>/Directory1/SubDirectory1/</directory>
<channelname>Demo TV Channel 1</channelname>
Expand All @@ -545,9 +546,12 @@
<time>12:00</time>
<duration>7200</duration>
<radio>0</radio>
<series>2</series>
<episode>1</episode>
</recording>
<recording>
<title>Demo TV Recording entry 2</title>
<episodetitle>Demo TV Recording 2 Episode Name</episodetitle>
<url>http://distribution.bbb3d.renderfarming.net/video/mp4/bbb_sunflower_1080p_30fps_normal.mp4</url>
<directory>/Directory1/SubDirectory1/</directory>
<channelname>Demo TV Channel 2</channelname>
Expand All @@ -558,12 +562,14 @@
<time>14:00</time>
<duration>7500</duration>
<radio>0</radio>
<episode>3</episode>
</recording>
<recording>
<title>Demo TV Recording entry 3</title>
<url>http://distribution.bbb3d.renderfarming.net/video/mp4/bbb_sunflower_1080p_30fps_normal.mp4</url>
<directory>/Directory1/SubDirectory1/</directory>
<channelname>Demo TV Channel 3</channelname>
<episodetitle>Demo TV Recording 3 Episode Name</episodetitle>
<plotoutline>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</plotoutline>
<plot>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam cursus consectetur ipsum, eu tincidunt dui aliquam ac. Sed scelerisque, augue eu lacinia ultrices, libero ante ullamcorper augue, vel malesuada justo risus ac nulla. Quisque ac libero libero. Sed tincidunt, orci eu condimentum laoreet, felis odio mattis est, et lacinia metus enim in leo. Fusce faucibus tristique risus in varius. Etiam sagittis venenatis ligula nec rutrum. Etiam gravida dictum hendrerit. Sed sodales felis in sapien rutrum non malesuada nisi lobortis. Mauris iaculis ante odio. Nunc gravida erat convallis purus dignissim et ultricies orci dapibus. Aliquam erat volutpat. Vestibulum mi felis, malesuada ac tincidunt sit amet, pulvinar nec dolor. Pellentesque vehicula est vulputate mi adipiscing euismod. Donec ac mauris nulla. Nullam suscipit felis eu quam sodales ac bibendum nisi interdum. Curabitur non lectus a ante venenatis semper eget id justo. Ut facilisis, ligula pretium dictum congue, lacus dolor commodo nibh, sit amet sodales sed.</plot>
<genretype>10</genretype>
Expand Down Expand Up @@ -802,10 +808,13 @@
<url></url>
<directory>/Directory1/SubDirectory1/</directory>
<channelname>Demo TV Channel 1</channelname>
<episodetitle>Demo TV Recording entry 11 Episode Name</episodetitle>
<plotoutline>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</plotoutline>
<plot>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam cursus consectetur ipsum, eu tincidunt dui aliquam ac. Sed scelerisque, augue eu lacinia ultrices, libero ante ullamcorper augue, vel malesuada justo risus ac nulla. Quisque ac libero libero. Sed tincidunt, orci eu condimentum laoreet, felis odio mattis est, et lacinia metus enim in leo. Fusce faucibus tristique risus in varius. Etiam sagittis venenatis ligula nec rutrum. Etiam gravida dictum hendrerit. Sed sodales felis in sapien rutrum non malesuada nisi lobortis. Mauris iaculis ante odio. Nunc gravida erat convallis purus dignissim et ultricies orci dapibus. Aliquam erat volutpat. Vestibulum mi felis, malesuada ac tincidunt sit amet, pulvinar nec dolor. Pellentesque vehicula est vulputate mi adipiscing euismod. Donec ac mauris nulla. Nullam suscipit felis eu quam sodales ac bibendum nisi interdum. Curabitur non lectus a ante venenatis semper eget id justo. Ut facilisis, ligula pretium dictum congue, lacus dolor commodo nibh, sit amet sodales sed.</plot>
<genretype>10</genretype>
<genresubtype>0</genresubtype>
<series>1</series>
<episode>2</episode>
<time>12:00</time>
<duration>7200</duration>
<radio>0</radio>
Expand All @@ -815,9 +824,11 @@
<url></url>
<directory>/Directory1/SubDirectory1/</directory>
<channelname>Demo TV Channel 2</channelname>
<episodetitle>Demo TV Recording entry 12 Episode Name</episodetitle>
<plotoutline>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</plotoutline>
<plot>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam cursus consectetur ipsum, eu tincidunt dui aliquam ac. Sed scelerisque, augue eu lacinia ultrices, libero ante ullamcorper augue, vel malesuada justo risus ac nulla. Quisque ac libero libero. Sed tincidunt, orci eu condimentum laoreet, felis odio mattis est, et lacinia metus enim in leo. Fusce faucibus tristique risus in varius. Etiam sagittis venenatis ligula nec rutrum. Etiam gravida dictum hendrerit. Sed sodales felis in sapien rutrum non malesuada nisi lobortis. Mauris iaculis ante odio. Nunc gravida erat convallis purus dignissim et ultricies orci dapibus. Aliquam erat volutpat. Vestibulum mi felis, malesuada ac tincidunt sit amet, pulvinar nec dolor. Pellentesque vehicula est vulputate mi adipiscing euismod. Donec ac mauris nulla. Nullam suscipit felis eu quam sodales ac bibendum nisi interdum. Curabitur non lectus a ante venenatis semper eget id justo. Ut facilisis, ligula pretium dictum congue, lacus dolor commodo nibh, sit amet sodales sed.</plot>
<genretype>10</genretype>
<episode>3</episode>
<genresubtype>0</genresubtype>
<time>14:00</time>
<duration>7500</duration>
Expand All @@ -828,6 +839,7 @@
<url></url>
<directory>/Directory1/SubDirectory1/</directory>
<channelname>Demo TV Channel 3</channelname>
<episodetitle>Demo TV Recording entry 13 Episode Name</episodetitle>
<plotoutline>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</plotoutline>
<plot>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam cursus consectetur ipsum, eu tincidunt dui aliquam ac. Sed scelerisque, augue eu lacinia ultrices, libero ante ullamcorper augue, vel malesuada justo risus ac nulla. Quisque ac libero libero. Sed tincidunt, orci eu condimentum laoreet, felis odio mattis est, et lacinia metus enim in leo. Fusce faucibus tristique risus in varius. Etiam sagittis venenatis ligula nec rutrum. Etiam gravida dictum hendrerit. Sed sodales felis in sapien rutrum non malesuada nisi lobortis. Mauris iaculis ante odio. Nunc gravida erat convallis purus dignissim et ultricies orci dapibus. Aliquam erat volutpat. Vestibulum mi felis, malesuada ac tincidunt sit amet, pulvinar nec dolor. Pellentesque vehicula est vulputate mi adipiscing euismod. Donec ac mauris nulla. Nullam suscipit felis eu quam sodales ac bibendum nisi interdum. Curabitur non lectus a ante venenatis semper eget id justo. Ut facilisis, ligula pretium dictum congue, lacus dolor commodo nibh, sit amet sodales sed.</plot>
<genretype>10</genretype>
Expand Down
2 changes: 1 addition & 1 deletion pvr.demo/addon.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.demo"
version="3.5.0"
version="3.5.1"
name="PVR Demo Client"
provider-name="Pulse-Eight Ltd., Team Kodi">
<requires>@ADDON_DEPENDS@</requires>
Expand Down
27 changes: 27 additions & 0 deletions src/PVRDemoData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,18 @@ bool PVRDemoData::LoadDemoData(void)
if (XMLUtils::GetString(pRecordingNode, "plotoutline", strTmp))
recording.strPlotOutline = strTmp;

/* Episode Name */
if (XMLUtils::GetString(pRecordingNode, "episodetitle", strTmp))
recording.strEpisodeName = strTmp;

/* Series Number */
if (!XMLUtils::GetInt(pRecordingNode, "series", recording.iSeriesNumber))
recording.iSeriesNumber = 0;

/* Episode Number */
if (!XMLUtils::GetInt(pRecordingNode, "episode", recording.iEpisodeNumber))
recording.iEpisodeNumber = 0;

/* genre type */
XMLUtils::GetInt(pRecordingNode, "genretype", recording.iGenreType);

Expand Down Expand Up @@ -342,6 +354,18 @@ bool PVRDemoData::LoadDemoData(void)
if (XMLUtils::GetString(pRecordingNode, "plotoutline", strTmp))
recording.strPlotOutline = strTmp;

/* Episode Name */
if (XMLUtils::GetString(pRecordingNode, "episodetitle", strTmp))
recording.strEpisodeName = strTmp;

/* Series Number */
if (!XMLUtils::GetInt(pRecordingNode, "series", recording.iSeriesNumber))
recording.iSeriesNumber = 0;

/* Episode Number */
if (!XMLUtils::GetInt(pRecordingNode, "episode", recording.iEpisodeNumber))
recording.iEpisodeNumber = 0;

/* genre type */
XMLUtils::GetInt(pRecordingNode, "genretype", recording.iGenreType);

Expand Down Expand Up @@ -617,6 +641,8 @@ PVR_ERROR PVRDemoData::GetRecordings(ADDON_HANDLE handle, bool bDeleted)
xbmcRecording.iGenreType = recording.iGenreType;
xbmcRecording.iGenreSubType = recording.iGenreSubType;
xbmcRecording.recordingTime = recording.recordingTime;
xbmcRecording.iEpisodeNumber = recording.iEpisodeNumber;
xbmcRecording.iSeriesNumber = recording.iSeriesNumber;
xbmcRecording.bIsDeleted = bDeleted;
xbmcRecording.channelType = recording.bRadio ? PVR_RECORDING_CHANNEL_TYPE_RADIO : PVR_RECORDING_CHANNEL_TYPE_TV;

Expand All @@ -625,6 +651,7 @@ PVR_ERROR PVRDemoData::GetRecordings(ADDON_HANDLE handle, bool bDeleted)
strncpy(xbmcRecording.strPlot, recording.strPlot.c_str(), sizeof(xbmcRecording.strPlot) - 1);
strncpy(xbmcRecording.strRecordingId, recording.strRecordingId.c_str(), sizeof(xbmcRecording.strRecordingId) - 1);
strncpy(xbmcRecording.strTitle, recording.strTitle.c_str(), sizeof(xbmcRecording.strTitle) - 1);
strncpy(xbmcRecording.strEpisodeName, recording.strEpisodeName.c_str(), sizeof(xbmcRecording.strEpisodeName) - 1);
strncpy(xbmcRecording.strDirectory, recording.strDirectory.c_str(), sizeof(xbmcRecording.strDirectory) - 1);

/* TODO: PVR API 5.0.0: Implement this */
Expand Down
3 changes: 3 additions & 0 deletions src/PVRDemoData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,15 @@ struct PVRDemoRecording
int iDuration;
int iGenreType;
int iGenreSubType;
int iSeriesNumber;
int iEpisodeNumber;
std::string strChannelName;
std::string strPlotOutline;
std::string strPlot;
std::string strRecordingId;
std::string strStreamURL;
std::string strTitle;
std::string strEpisodeName;
std::string strDirectory;
time_t recordingTime;
};
Expand Down