mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
[CST] Focus
2012-03-11 16:32:30 +04:00
parent 63b779d8a7 78c82f22a5
commit dfe4974b5f
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/streaminfo2.cpp
View File

@@ -665,26 +665,26 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
spaceoffset = 7 * fontW; spaceoffset = 7 * fontW;
//onid //onid
ypos+= sheight; ypos+= sheight;
sprintf((char*) buf, "0x%04x (%i)", si.onid, si.onid); sprintf((char*) buf, "0x%04X (%i)", si.onid, si.onid);
g_Font[font_small]->RenderString(xpos, ypos, box_width, "ONid:" , COL_INFOBAR, 0, true); // UTF-8 g_Font[font_small]->RenderString(xpos, ypos, box_width, "ONid:" , COL_INFOBAR, 0, true); // UTF-8
g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, box_width, buf, COL_INFOBAR, 0, true); // UTF-8 g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, box_width, buf, COL_INFOBAR, 0, true); // UTF-8
//sid //sid
ypos+= sheight; ypos+= sheight;
sprintf((char*) buf, "0x%04x (%i)", si.sid, si.sid); sprintf((char*) buf, "0x%04X (%i)", si.sid, si.sid);
g_Font[font_small]->RenderString(xpos, ypos, box_width, "Sid:" , COL_INFOBAR, 0, true); // UTF-8 g_Font[font_small]->RenderString(xpos, ypos, box_width, "Sid:" , COL_INFOBAR, 0, true); // UTF-8
g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, box_width, buf, COL_INFOBAR, 0, true); // UTF-8 g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, box_width, buf, COL_INFOBAR, 0, true); // UTF-8
//tsid //tsid
ypos+= sheight; ypos+= sheight;
sprintf((char*) buf, "0x%04x (%i)", si.tsid, si.tsid); sprintf((char*) buf, "0x%04X (%i)", si.tsid, si.tsid);
g_Font[font_small]->RenderString(xpos, ypos, box_width, "TSid:" , COL_INFOBAR, 0, true); // UTF-8 g_Font[font_small]->RenderString(xpos, ypos, box_width, "TSid:" , COL_INFOBAR, 0, true); // UTF-8
g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, box_width, buf, COL_INFOBAR, 0, true); // UTF-8 g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, box_width, buf, COL_INFOBAR, 0, true); // UTF-8
//pmtpid //pmtpid
ypos+= sheight; ypos+= sheight;
pmt_version = si.pmt_version; pmt_version = si.pmt_version;
sprintf((char*) buf, "0x%04x (%i) [%i]", si.pmtpid, si.pmtpid,pmt_version); sprintf((char*) buf, "0x%04X (%i) [%i]", si.pmtpid, si.pmtpid,pmt_version);
g_Font[font_small]->RenderString(xpos, ypos, box_width, "PMTpid:", COL_INFOBAR, 0, true); // UTF-8 g_Font[font_small]->RenderString(xpos, ypos, box_width, "PMTpid:", COL_INFOBAR, 0, true); // UTF-8
g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, box_width, buf, COL_INFOBAR, 0, true); // UTF-8 g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, box_width, buf, COL_INFOBAR, 0, true); // UTF-8
@@ -692,7 +692,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
//vpid //vpid
ypos+= sheight; ypos+= sheight;
if ( g_RemoteControl->current_PIDs.PIDs.vpid > 0 ){ if ( g_RemoteControl->current_PIDs.PIDs.vpid > 0 ){
sprintf((char*) buf, "0x%04x (%i)", g_RemoteControl->current_PIDs.PIDs.vpid, g_RemoteControl->current_PIDs.PIDs.vpid ); sprintf((char*) buf, "0x%04X (%i)", g_RemoteControl->current_PIDs.PIDs.vpid, g_RemoteControl->current_PIDs.PIDs.vpid );
} else { } else {
sprintf((char*) buf, "%s", g_Locale->getText(LOCALE_STREAMINFO_NOT_AVAILABLE)); sprintf((char*) buf, "%s", g_Locale->getText(LOCALE_STREAMINFO_NOT_AVAILABLE));
} }
@@ -708,7 +708,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
unsigned int sw=spaceoffset; unsigned int sw=spaceoffset;
for (unsigned int li= 0; (li<g_RemoteControl->current_PIDs.APIDs.size()) && (li<10); li++) for (unsigned int li= 0; (li<g_RemoteControl->current_PIDs.APIDs.size()) && (li<10); li++)
{ {
sprintf((char*) buf, "0x%04x (%i)", g_RemoteControl->current_PIDs.APIDs[li].pid, g_RemoteControl->current_PIDs.APIDs[li].pid ); sprintf((char*) buf, "0x%04X (%i)", g_RemoteControl->current_PIDs.APIDs[li].pid, g_RemoteControl->current_PIDs.APIDs[li].pid );
if (li == g_RemoteControl->current_PIDs.PIDs.selected_apid){ if (li == g_RemoteControl->current_PIDs.PIDs.selected_apid){
g_Font[font_small]->RenderString(xpos+sw, ypos, box_width, buf, COL_MENUHEAD, 0, true); // UTF-8 g_Font[font_small]->RenderString(xpos+sw, ypos, box_width, buf, COL_MENUHEAD, 0, true); // UTF-8
} }
@@ -728,7 +728,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
if ( g_RemoteControl->current_PIDs.PIDs.vtxtpid == 0 ) if ( g_RemoteControl->current_PIDs.PIDs.vtxtpid == 0 )
sprintf((char*) buf, "%s", g_Locale->getText(LOCALE_STREAMINFO_NOT_AVAILABLE)); sprintf((char*) buf, "%s", g_Locale->getText(LOCALE_STREAMINFO_NOT_AVAILABLE));
else else
sprintf((char*) buf, "0x%04x (%i)", g_RemoteControl->current_PIDs.PIDs.vtxtpid, g_RemoteControl->current_PIDs.PIDs.vtxtpid ); sprintf((char*) buf, "0x%04X (%i)", g_RemoteControl->current_PIDs.PIDs.vtxtpid, g_RemoteControl->current_PIDs.PIDs.vtxtpid );
g_Font[font_small]->RenderString(xpos, ypos, box_width, "VTXTpid:" , COL_INFOBAR, 0, true); // UTF-8 g_Font[font_small]->RenderString(xpos, ypos, box_width, "VTXTpid:" , COL_INFOBAR, 0, true); // UTF-8
g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, box_width, buf, COL_INFOBAR, 0, true); // UTF-8 g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, box_width, buf, COL_INFOBAR, 0, true); // UTF-8
if(box_h == 0) if(box_h == 0)

23
src/neutrino.cpp
View File

@@ -147,11 +147,13 @@ void * sectionsd_main_thread(void *data);
extern bool timeset; // sectionsd extern bool timeset; // sectionsd
extern cVideo * videoDecoder; extern cVideo * videoDecoder;
extern cDemux *videoDemux;
extern cAudio * audioDecoder; extern cAudio * audioDecoder;
cPowerManager *powerManager; cPowerManager *powerManager;
cCpuFreqManager * cpuFreq; cCpuFreqManager * cpuFreq;
void stop_daemons(bool stopall = true); void stop_daemons(bool stopall = true);
void stop_video(void);
// uncomment if you want to have a "test" menue entry (rasc) // uncomment if you want to have a "test" menue entry (rasc)
//#define __EXPERIMENTAL_CODE__ //#define __EXPERIMENTAL_CODE__
@@ -2974,8 +2976,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
standby.timer_minutes_hi = fp_timer >> 8;; standby.timer_minutes_hi = fp_timer >> 8;;
standby.timer_minutes_lo = fp_timer & 0xFF; standby.timer_minutes_lo = fp_timer & 0xFF;
delete videoDecoder; stop_video();
cs_api_exit();
int fd = open("/dev/display", O_RDONLY); int fd = open("/dev/display", O_RDONLY);
if (fd < 0) { if (fd < 0) {
@@ -3040,7 +3041,8 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
delete funNotifier; delete funNotifier;
} }
//CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_REBOOT)); //CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_REBOOT));
//delete frameBuffer; stop_video();
#if 0 /* FIXME this next hack to test, until we find real crash on exit reason */ #if 0 /* FIXME this next hack to test, until we find real crash on exit reason */
system("/etc/init.d/rcK"); system("/etc/init.d/rcK");
system("/bin/sync"); system("/bin/sync");
@@ -3622,11 +3624,9 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
delete g_fontRenderer; delete g_fontRenderer;
delete hintBox; delete hintBox;
delete frameBuffer;
stop_daemons(true); stop_daemons(true);
delete videoDecoder; stop_video();
cs_api_exit();
/* g_Timerd, g_Zapit and CVFD are used in stop_daemons */ /* g_Timerd, g_Zapit and CVFD are used in stop_daemons */
delete g_Timerd; delete g_Timerd;
delete g_Zapit; //do we really need this? delete g_Zapit; //do we really need this?
@@ -3747,6 +3747,14 @@ void stop_daemons(bool stopall)
} }
} }
void stop_video()
{
delete videoDecoder;
delete videoDemux;
delete CFrameBuffer::getInstance();
cs_api_exit();
}
void sighandler (int signum) void sighandler (int signum)
{ {
signal (signum, SIG_IGN); signal (signum, SIG_IGN);
@@ -3756,8 +3764,7 @@ void sighandler (int signum)
delete CRecordManager::getInstance(); delete CRecordManager::getInstance();
CNeutrinoApp::getInstance()->saveSetup(NEUTRINO_SETTINGS_FILE); CNeutrinoApp::getInstance()->saveSetup(NEUTRINO_SETTINGS_FILE);
stop_daemons(); stop_daemons();
delete videoDecoder; stop_video();
cs_api_exit();
_exit(0); _exit(0);
default: default:
break; break;

1
src/zapit/src/zapit.cpp
View File

@@ -2154,7 +2154,6 @@ void CZapit::run()
delete pcrDemux; delete pcrDemux;
delete pmtDemux; delete pmtDemux;
delete audioDecoder; delete audioDecoder;
delete videoDemux;
delete audioDemux; delete audioDemux;
INFO("demuxes/decoders deleted"); INFO("demuxes/decoders deleted");