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

Fix merge conflicts

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8272eda529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-08-19 17:58:43 +02:00
parent 5d86ff2594
commit a19fe6bed0
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libdvbsub/dvbsubtitle.cpp
View File

@@ -135,7 +135,7 @@ void cDvbSubtitleBitmaps::Draw(int &min_x, int &min_y, int &max_x, int &max_y)
double yc = (double) CFrameBuffer::getInstance()->getScreenHeight(true)/(double) 576; double yc = (double) CFrameBuffer::getInstance()->getScreenHeight(true)/(double) 576;
xc = yc; //FIXME should we scale also to full width ? xc = yc; //FIXME should we scale also to full width ?
int xf = int(xc * (double) 720); int xf = int(xc * (double) 720);
#endif
for (i = 0; i < Count(); i++) { for (i = 0; i < Count(); i++) {
uint32_t * colors = (uint32_t *) sub.rects[i]->pict.data[1]; uint32_t * colors = (uint32_t *) sub.rects[i]->pict.data[1];
int width = sub.rects[i]->w; int width = sub.rects[i]->w;

2
lib/timerdclient/timerdclient.cpp
View File

@@ -34,7 +34,7 @@
#define VALGRIND_PARANOIA(x) {} #define VALGRIND_PARANOIA(x) {}
#endif #endif
int CTimerdClient::adzap_eventID = 0; //int CTimerdClient::adzap_eventID = 0;
unsigned char CTimerdClient::getVersion () const unsigned char CTimerdClient::getVersion () const
{ {

2
src/daemonc/remotecontrol.cpp
View File

@@ -503,8 +503,8 @@ void CRemoteControl::processAPIDnames()
#endif #endif
for(unsigned int count=0; count< current_PIDs.APIDs.size(); count++) for(unsigned int count=0; count< current_PIDs.APIDs.size(); count++)
{ {
const char *iso = getISO639Description(current_PIDs.APIDs[count].desc);
#ifdef APID_DEBUG #ifdef APID_DEBUG
const char *iso = getISO639Description(current_PIDs.APIDs[count].desc);
printf("apid=%04x/%s/%s ", current_PIDs.APIDs[count].pid, current_PIDs.APIDs[count].desc, iso); printf("apid=%04x/%s/%s ", current_PIDs.APIDs[count].pid, current_PIDs.APIDs[count].desc, iso);
#endif #endif
if ( current_PIDs.APIDs[count].component_tag != 0xFF ) if ( current_PIDs.APIDs[count].component_tag != 0xFF )

9
src/driver/streamts.cpp
View File

@@ -56,7 +56,10 @@
#include <driver/streamts.h> #include <driver/streamts.h>
#include <driver/record.h> #include <driver/record.h>
#include <driver/genpsi.h> #include <driver/genpsi.h>
//#include <system/set_threadname.h> /* merge conflict */
#if 0
#include <system/set_threadname.h>
#endif
#include <gui/movieplayer.h> #include <gui/movieplayer.h>
#include <cs_api.h> #include <cs_api.h>
@@ -165,6 +168,7 @@ void CStreamInstance::RemoveClient(int clientfd)
bool CStreamInstance::Open() bool CStreamInstance::Open()
{ {
/* merge conflict */
#if 0 #if 0
printf("CStreamInstance::run: %" PRIx64 "\n", channel_id); printf("CStreamInstance::run: %" PRIx64 "\n", channel_id);
set_threadname("n:streaminstance"); set_threadname("n:streaminstance");
@@ -558,7 +562,10 @@ void CStreamManager::run()
int poll_timeout = -1; int poll_timeout = -1;
printf("Starting STREAM thread keeper, tid %ld\n", syscall(__NR_gettid)); printf("Starting STREAM thread keeper, tid %ld\n", syscall(__NR_gettid));
/* merge conflict */
#if 0
set_threadname("n:streammanager"); set_threadname("n:streammanager");
#endif
while (running) { while (running) {
mutex.lock(); mutex.lock();

1
src/system/helpers.cpp
View File

@@ -46,6 +46,7 @@
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/fs.h> #include <linux/fs.h>
#include "debug.h" #include "debug.h"
#include <driver/fontrenderer.h>
#include <global.h> #include <global.h>
#include <system/helpers.h> #include <system/helpers.h>
#include <gui/update_ext.h> #include <gui/update_ext.h>