mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-26 15:02:43 +02:00
Merge branch 'master' of https://github.com/TangoCash/libstb-hal-cst-next
Origin commit data
------------------
Branch: master
Commit: 5a7a8abb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-02-09 (Fri, 09 Feb 2018)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -87,7 +87,7 @@ bool cPlayback::Start(std::string filename, std::string headers)
|
||||
return Start((char *) filename.c_str(), 0, 0, 0, 0, 0, headers);
|
||||
}
|
||||
|
||||
bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, int, std::string headers)
|
||||
bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, int, std::string headers __attribute__((unused)))
|
||||
{
|
||||
bool ret = false;
|
||||
bool isHTTP = false;
|
||||
@@ -247,7 +247,7 @@ bool cPlayback::SetAPid(int pid, bool /* ac3 */)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cPlayback::SetVPid(int pid)
|
||||
bool cPlayback::SetVPid(int /*pid*/)
|
||||
{
|
||||
lt_info("%s\n", __func__);
|
||||
return true;
|
||||
@@ -269,7 +269,7 @@ bool cPlayback::SetSubtitlePid(int pid)
|
||||
bool cPlayback::SetTeletextPid(int pid)
|
||||
{
|
||||
lt_info("%s\n", __func__);
|
||||
int i = pid;
|
||||
//int i = pid;
|
||||
if (pid != mTeletextStream)
|
||||
{
|
||||
//if(player && player->playback)
|
||||
@@ -534,10 +534,10 @@ void cPlayback::FindAllSubtitlePids(int *pids, unsigned int *numpids, std::strin
|
||||
}
|
||||
}
|
||||
|
||||
void cPlayback::FindAllTeletextsubtitlePids(int *pids, unsigned int *numpids, std::string *language, int *mags, int *pages)
|
||||
void cPlayback::FindAllTeletextsubtitlePids(int */*pids*/, unsigned int *numpids, std::string */*language*/, int */*mags*/, int */*pages*/)
|
||||
{
|
||||
lt_info("%s\n", __func__);
|
||||
int max_numpids = *numpids;
|
||||
//int max_numpids = *numpids;
|
||||
*numpids = 0;
|
||||
/*
|
||||
if (player && player->manager && player->manager->teletext)
|
||||
|
Reference in New Issue
Block a user