mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/mp' into ni/cst-next

Browse Source 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
This commit is contained in:
vanhofen
2016-08-26 19:13:47 +02:00
parent 01add923d6 6e38f7b956
commit bc33663742
220 changed files with 7577 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/driver/streamts.cpp
View File

@@ -56,6 +56,10 @@
#include <driver/streamts.h>
#include <driver/record.h>
#include <driver/genpsi.h>
/* merge conflict */
#if 0
#include <system/set_threadname.h>
#endif
#include <gui/movieplayer.h>
#include <cs_api.h>
@@ -73,7 +77,7 @@
CStreamInstance::CStreamInstance(int clientfd, t_channel_id chid, stream_pids_t &_pids)
{
printf("CStreamInstance:: new channel %llx fd %d\n", chid, clientfd);
printf("CStreamInstance:: new channel %" PRIx64 " fd %d\n", chid, clientfd);
fds.insert(clientfd);
pids = _pids;
channel_id = chid;
@@ -99,7 +103,7 @@ bool CStreamInstance::Start()
return false;
}
running = true;
printf("CStreamInstance::Start: %llx\n", channel_id);
printf("CStreamInstance::Start: %" PRIx64 "\n", channel_id);
return (OpenThreads::Thread::start() == 0);
}
@@ -108,7 +112,7 @@ bool CStreamInstance::Stop()
if (!running)
return false;
printf("CStreamInstance::Stop: %llx\n", channel_id);
printf("CStreamInstance::Stop: %" PRIx64 "\n", channel_id);
running = false;
return (OpenThreads::Thread::join() == 0);
}
@@ -135,7 +139,7 @@ bool CStreamInstance::Send(ssize_t r, unsigned char * _buf)
}
} while ((count > 0) && (i-- > 0));
if (count)
printf("send err, fd %d: (%d from %d)\n", *it, r-count, r);
printf("send err, fd %d: (%zd from %zd)\n", *it, r-count, r);
}
return true;
}
@@ -151,7 +155,7 @@ void CStreamInstance::AddClient(int clientfd)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
fds.insert(clientfd);
printf("CStreamInstance::AddClient: %d (count %d)\n", clientfd, fds.size());
printf("CStreamInstance::AddClient: %d (count %d)\n", clientfd, (int)fds.size());
}
void CStreamInstance::RemoveClient(int clientfd)
@@ -159,11 +163,18 @@ void CStreamInstance::RemoveClient(int clientfd)
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
fds.erase(clientfd);
close(clientfd);
printf("CStreamInstance::RemoveClient: %d (count %d)\n", clientfd, fds.size());
printf("CStreamInstance::RemoveClient: %d (count %d)\n", clientfd, (int)fds.size());
}
bool CStreamInstance::Open()
{
/* merge conflict */
#if 0
printf("CStreamInstance::run: %" PRIx64 "\n", channel_id);
set_threadname("n:streaminstance");
#endif
CZapitChannel * tmpchan = CServiceManager::getInstance()->FindChannel(channel_id);
if (!tmpchan)
return false;
@@ -203,7 +214,7 @@ void CStreamInstance::run()
CCamManager::getInstance()->Stop(channel_id, CCamManager::STREAM);
printf("CStreamInstance::run: exiting %llx (%d fds)\n", channel_id, fds.size());
printf("CStreamInstance::run: exiting %" PRIx64 " (%d fds)\n", channel_id, (int)fds.size());
Close();
delete dmx;
@@ -289,7 +300,7 @@ CFrontend * CStreamManager::FindFrontend(CZapitChannel * channel)
t_channel_id chid = channel->getChannelID();
if (CRecordManager::getInstance()->RecordingStatus(chid)) {
printf("CStreamManager::FindFrontend: channel %llx recorded, aborting..\n", chid);
printf("CStreamManager::%s: channel %" PRIx64 " recorded, aborting..\n", __func__, chid);
return frontend;
}
@@ -411,7 +422,7 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
#else
t_channel_id tmpid;
bp = &cbuf[5];
if (sscanf(bp, "id=%llx", &tmpid) == 1) {
if (sscanf(bp, "id=%" SCNx64, &tmpid) == 1) {
channel = CServiceManager::getInstance()->FindChannel(tmpid);
chid = tmpid;
}
@@ -419,7 +430,7 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
if (!channel)
return false;
printf("CStreamManager::Parse: channel_id %llx [%s]\n", chid, channel->getName().c_str());
printf("CStreamManager::Parse: channel_id %" PRIx64 " [%s]\n", chid, channel->getName().c_str());
if (IS_WEBTV(chid))
return true;
@@ -437,7 +448,7 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
void CStreamManager::AddPids(int fd, CZapitChannel *channel, stream_pids_t &pids)
{
if (pids.empty()) {
printf("CStreamManager::AddPids: no pids in url, using channel %llx pids\n", channel->getChannelID());
printf("CStreamManager::AddPids: no pids in url, using channel %" PRIx64 " pids\n", channel->getChannelID());
if (channel->getVideoPid())
pids.insert(channel->getVideoPid());
for (int i = 0; i < channel->getAudioChannelCount(); i++)
@@ -551,6 +562,10 @@ void CStreamManager::run()
int poll_timeout = -1;
printf("Starting STREAM thread keeper, tid %ld\n", syscall(__NR_gettid));
/* merge conflict */
#if 0
set_threadname("n:streammanager");
#endif
while (running) {
mutex.lock();