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

Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3'

Browse Source 
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
This commit is contained in:
Stefan Seyfried
2012-10-14 12:51:07 +02:00
parent 41d55e7c91 890b4f2c0a
commit 345a8a274d
442 changed files with 7648 additions and 4167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gui/streaminfo2.cpp
View File

@@ -94,6 +94,7 @@ CStreamInfo2::CStreamInfo2 ()
box_h = 0;
box_h2 = 0;
yypos = -1;
dmxbuf = NULL;
}
CStreamInfo2::~CStreamInfo2 ()
@@ -511,7 +512,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
sprintf (buf, "20:9");
break;
default:
strncpy (buf, g_Locale->getText (LOCALE_STREAMINFO_ARATIO_UNKNOWN), sizeof (buf));
strncpy (buf, g_Locale->getText (LOCALE_STREAMINFO_ARATIO_UNKNOWN), sizeof (buf)-1);
}
g_Font[font_info]->RenderString (xpos+spaceoffset, ypos, box_width, buf, COL_INFOBAR, 0, true); // UTF-8
@@ -545,7 +546,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
snprintf (buf,sizeof(buf), "60fps");
break;
default:
strncpy (buf, g_Locale->getText (LOCALE_STREAMINFO_FRAMERATE_UNKNOWN), sizeof (buf));
strncpy (buf, g_Locale->getText (LOCALE_STREAMINFO_FRAMERATE_UNKNOWN), sizeof (buf)-1);
break;
}
g_Font[font_info]->RenderString (xpos+spaceoffset, ypos, box_width, buf, COL_INFOBAR, 0, true); // UTF-8
@@ -786,8 +787,6 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
/*
* some definition
*/
#define TS_LEN 188
#define TS_BUF_SIZE (TS_LEN * 2048) /* fix dmx buffer size */
static unsigned long timeval_to_ms (const struct timeval *tv)
{
@@ -799,7 +798,6 @@ long delta_time_ms (struct timeval *tv, struct timeval *last_tv)
return timeval_to_ms (tv) - timeval_to_ms (last_tv);
}
uint64_t b_total;
static cDemux * dmx;
int CStreamInfo2::ts_setup ()
@@ -814,11 +812,22 @@ int CStreamInfo2::ts_setup ()
if( !g_RemoteControl->current_PIDs.APIDs.empty() )
apid = g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].pid;
short ret = -1;
if(vpid == 0 && apid == 0)
return -1;
return ret;
dmx = new cDemux(0);//FIXME test
dmx = new cDemux(0);
if(!dmx)
return ret;
#define TS_LEN 188
#define TS_BUF_SIZE (TS_LEN * 2048) /* fix dmx buffer size */
dmxbuf = new unsigned char[TS_BUF_SIZE];
if(!dmxbuf){
delete dmx;
dmx = NULL;
return ret;
}
dmx->Open(DMX_TP_CHANNEL, NULL, 3 * 3008 * 62);
if(vpid > 0) {
@@ -833,8 +842,8 @@ int CStreamInfo2::ts_setup ()
gettimeofday (&first_tv, NULL);
last_tv.tv_sec = first_tv.tv_sec;
last_tv.tv_usec = first_tv.tv_usec;
b_total = 0;
return 0;
ret = b_total = 0;
return ret;
}
int CStreamInfo2::update_rate ()
@@ -842,8 +851,6 @@ int CStreamInfo2::update_rate ()
if(!dmx)
return 0;
unsigned char buf[TS_BUF_SIZE] = {0};
long b = 0;
int ret = 0;
@@ -851,7 +858,7 @@ int CStreamInfo2::update_rate ()
int timeout = 100;
b_len = dmx->Read(buf, sizeof (buf), timeout);
b_len = dmx->Read(dmxbuf, TS_BUF_SIZE, timeout);
//printf("ts: read %d\n", b_len);
b = b_len;
@@ -889,6 +896,9 @@ int CStreamInfo2::ts_close ()
if(dmx)
delete dmx;
dmx = NULL;
if(dmxbuf)
delete [] dmxbuf;
dmxbuf = NULL;
return 0;
}