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

fix last merge

Browse Source 
Origin commit data
------------------
Commit: 4bbfbe997b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- fix last merge
This commit is contained in:
vanhofen
2016-10-25 13:15:57 +02:00
parent ee5ff0408d
commit 280b559852
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/driver/streamts.cpp
View File

@@ -56,10 +56,7 @@
#include <driver/streamts.h> #include <driver/streamts.h>
#include <driver/record.h> #include <driver/record.h>
#include <driver/genpsi.h> #include <driver/genpsi.h>
/* merge conflict */
#if 0
#include <system/set_threadname.h> #include <system/set_threadname.h>
#endif
#include <gui/movieplayer.h> #include <gui/movieplayer.h>
#include <cs_api.h> #include <cs_api.h>
@@ -168,13 +165,9 @@ void CStreamInstance::RemoveClient(int clientfd)
bool CStreamInstance::Open() bool CStreamInstance::Open()
{ {
/* merge conflict */
#if 0
printf("CStreamInstance::run: %" PRIx64 "\n", channel_id); printf("CStreamInstance::run: %" PRIx64 "\n", channel_id);
set_threadname("n:streaminstance"); set_threadname("n:streaminstance");
#endif
CZapitChannel * tmpchan = CServiceManager::getInstance()->FindChannel(channel_id); CZapitChannel * tmpchan = CServiceManager::getInstance()->FindChannel(channel_id);
if (!tmpchan) if (!tmpchan)
return false; return false;