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-05-03 17:45:01 +04:00
parent b817fdba17 151ad95def
commit 6bb9f52fc8
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neutrino.cpp
View File

@@ -129,7 +129,6 @@ bool autoshift = false;
uint32_t scrambled_timer;
t_channel_id standby_channel_id;
//static CProgressBar *g_volscale;
//NEW
static pthread_t timer_thread;
void * timerd_main_thread(void *data);
@@ -1890,7 +1889,6 @@ TIMER_START();
int dx, dy;
frameBuffer->getIconSize(NEUTRINO_ICON_VOLUME, &dx, &dy);
//g_volscale = new CProgressBar(true, dy * 125 / 10, dy, 50, 100, 80, true);
g_CamHandler = new CCAMMenuHandler();
g_CamHandler->init();