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

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-10-22 11:37:40 +02:00
parent c0910d6be4 a41206902f
commit 3f75ef5f47
346 changed files with 13372 additions and 6088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libdvbsub/dvbsub.cpp
View File

@@ -115,7 +115,7 @@ printf("[dvb-sub] ***************************************** start, stopped %d pi
pthread_mutex_lock(&readerMutex);
pthread_cond_broadcast(&readerCond);
pthread_mutex_unlock(&readerMutex);
printf("[dvb-sub] started with pid 0x%x\n", pid);
printf("[dvb-sub] started with pid 0x%x\n", dvbsub_pid);
}
return 1;
@@ -280,9 +280,6 @@ static void* reader_thread(void * /*arg*/)
sub_debug.print(Debug::VERBOSE, "%s changed to pid 0x%x\n", __FUNCTION__, dvbsub_pid);
}
len = 0;
count = 0;
len = dmx->Read(tmp, 6, 1000);
if(len <= 0)
continue;

14
lib/libdvbsub/dvbsubtitle.cpp
View File

@@ -130,7 +130,7 @@ void cDvbSubtitleBitmaps::Draw(int &min_x, int &min_y, int &max_x, int &max_y)
double xc = (double) CFrameBuffer::getInstance()->getScreenWidth(true)/(double) 720;
double yc = (double) CFrameBuffer::getInstance()->getScreenHeight(true)/(double) 576;
xc = yc; //FIXME should we scale also to full width ?
int xf = xc * (double) 720;
int xf = int(xc * (double) 720);
#endif
for (i = 0; i < Count(); i++) {
@@ -140,15 +140,15 @@ void cDvbSubtitleBitmaps::Draw(int &min_x, int &min_y, int &max_x, int &max_y)
int xoff, yoff;
#if 0
int nw = width == 1280 ? ((double) width / xc) : ((double) width * xc);
int nh = (double) height * yc;
int nw = int(width == 1280 ? ((double) width / xc) : ((double) width * xc));
int nh = int((double) height * yc);
int xdiff = (wd > xf) ? ((wd - xf) / 2) : 0;
xoff = sub.rects[i]->x*xc + xstart + xdiff;
xoff = int(sub.rects[i]->x*xc + xstart + xdiff);
if(sub.rects[i]->y < 576/2) {
yoff = ystart + sub.rects[i]->y*yc;
yoff = int(ystart + sub.rects[i]->y*yc);
} else {
yoff = yend - ((width == 1280 ? 704:576) - (double) (sub.rects[i]->y + height))*yc - nh;
yoff = int(yend - ((width == 1280 ? 704:576) - (double) (sub.rects[i]->y + height))*yc - nh);
if(yoff < ystart)
yoff = ystart;
}
@@ -379,7 +379,7 @@ dbgconverter("cDvbSubtitleConverter::Action: PTS: %012llx STC: %012llx (%lld) ti
// shown = true;
}
else if (Delta < WaitMs)
WaitMs = (Delta > SHOW_DELTA) ? Delta - SHOW_DELTA : Delta;
WaitMs = int((Delta > SHOW_DELTA) ? Delta - SHOW_DELTA : Delta);
}
else
{

4
lib/libdvbsub/tools.h
View File

@@ -120,8 +120,8 @@ private:
mutable int allocated;
mutable int size;
mutable T *data;
cVector(const cVector &Vector) {} // don't copy...
cVector &operator=(const cVector &Vector) { return *this; } // ...or assign this!
// cVector(const cVector &Vector) {} // don't copy...
// cVector &operator=(const cVector &Vector) { return *this; } // ...or assign this!
void Realloc(int Index) const
{
if (++Index > allocated) {