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

#13338 Add support for playback of requested Live TV channel from Frontend Services API #173

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

#13338 Add support for playback of requested Live TV channel from Frontend Services API #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d86524d
Add support for PlayLiveTV in frontend API
JRRandall Oct 26, 2018
aa039e2
Added support for PlayLiveTV in frontend API
JRRandall Oct 26, 2018
eea0ffc
Added support for PlayLiveTV in frontend API
JRRandall Oct 26, 2018
ed9e382
Resolving conflicts from previous pull request.
JRRandall May 7, 2019
28dd971
Resolving conflicts for pull request
JRRandall May 7, 2019
d200bed
Merge branch 'master' into master
JRRandall May 7, 2019
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
2 changes: 2 additions & 0 deletions mythtv/libs/libmythservicecontracts/services/frontendServices.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class SERVICE_PUBLIC FrontendServices : public Service
Q_CLASSINFO( "SendNotification_Method", "POST" )
Q_CLASSINFO( "SendAction_Method", "POST" )
Q_CLASSINFO( "PlayRecording_Method", "POST" )
Q_CLASSINFO( "PlayLiveTV_Method", "POST" )
Q_CLASSINFO( "PlayVideo_Method", "POST" )
Q_CLASSINFO( "SendKey_Method", "POST" )

Expand Down Expand Up @@ -47,6 +48,7 @@ class SERVICE_PUBLIC FrontendServices : public Service
uint Width, uint Height) = 0;
virtual bool PlayRecording(int RecordedId, int ChanId,
const QDateTime &StartTime) = 0;
virtual bool PlayLiveTV(int ChanId) = 0;
virtual bool PlayVideo(const QString &Id,
bool UseBookmark) = 0;
virtual QStringList GetContextList(void) = 0;
Expand Down
38 changes: 38 additions & 0 deletions mythtv/programs/mythfrontend/services/frontend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,44 @@ bool Frontend::PlayRecording(int RecordedId, int ChanId,
return false;
}

bool Frontend::PlayLiveTV(int ChanId)
{
if (ChanId <= 0)
{
LOG(VB_GENERAL, LOG_ERR, LOC +
QString("PlayLiveTV: Channel ID is invalid."));
return false;
}

// channel tuning is only available from state playback i.e. Live TV
if (GetMythUI()->GetCurrentLocation().toLower() != "playback")
{
GetMythMainWindow()->JumpTo(jumpMap["Live TV"]);

QTime timer;
timer.start();
while ((timer.elapsed() < FE_LONG_TO) &&
(GetMythUI()->GetCurrentLocation().toLower() != "playback"))
std::this_thread::sleep_for(std::chrono::milliseconds(10));
}

if (GetMythUI()->GetCurrentLocation().toLower() == "playback")
{
LOG(VB_GENERAL, LOG_INFO, LOC +
QString("PlayLiveTV, ChanID: %1")
.arg(ChanId));

QString message = QString("NETWORK_CONTROL PLAY CHANID %1")
.arg(ChanId);

MythEvent me(message);
gCoreContext->dispatch(me);
return true;
}

return false;
}

bool Frontend::PlayVideo(const QString &Id, bool UseBookmark)
{
if (TV::IsTVRunning())
Expand Down
1 change: 1 addition & 0 deletions mythtv/programs/mythfrontend/services/frontend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class Frontend : public FrontendServices
uint Width, uint Height) override; // FrontendServices
bool PlayRecording(int RecordedId, int ChanId,
const QDateTime &StartTime) override; // FrontendServices
bool PlayLiveTV(int ChanId) override; // FrontendServices
bool PlayVideo(const QString &Id, bool UseBookmark) override; // FrontendServices
QStringList GetContextList(void) override; // FrontendServices
DTC::FrontendActionList* GetActionList(const QString &Context) override; // FrontendServices
Expand Down