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

remove unneeded CConfigFile from lcdd and shutdown_count

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: f2791fa792
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-11-09 16:00:00 +01:00
parent da31fd757e
commit d2ccb40e1e
4 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/driver/lcdd.cpp
View File

@@ -1,13 +1,11 @@
/* /*
$Id$
LCD-Daemon - DBoxII-Project LCD-Daemon - DBoxII-Project
Copyright (C) 2001 Steffen Hehn 'McClean' Copyright (C) 2001 Steffen Hehn 'McClean'
Homepage: http://dbox.cyberphoria.org/ Homepage: http://dbox.cyberphoria.org/
Copyright (C) 2008 Novell, Inc. Author: Stefan Seyfried Copyright (C) 2008 Novell, Inc. Author: Stefan Seyfried
(C) 2009-2012 Stefan Seyfried (C) 2009-2013 Stefan Seyfried
License: GPL License: GPL
@@ -85,7 +83,6 @@ static bool isUTF8(const std::string &string)
} }
CLCD::CLCD() CLCD::CLCD()
: configfile('\t')
{ {
#ifdef LCD_UPDATE #ifdef LCD_UPDATE
m_fileList = NULL; m_fileList = NULL;

7
src/driver/lcdd.h
View File

@@ -1,12 +1,10 @@
/* /*
$Id$
LCD-Daemon - DBoxII-Project LCD-Daemon - DBoxII-Project
Copyright (C) 2001 Steffen Hehn 'McClean' Copyright (C) 2001 Steffen Hehn 'McClean'
Homepage: http://dbox.cyberphoria.org/ Homepage: http://dbox.cyberphoria.org/
Copyright (C) 2008-2012 Stefan Seyfried Copyright (C) 2008-2013 Stefan Seyfried
License: GPL License: GPL
@@ -77,8 +75,8 @@ typedef enum
#include "driver/file.h" #include "driver/file.h"
#endif // LCD_UPDATE #endif // LCD_UPDATE
#include <configfile.h>
#include <pthread.h> #include <pthread.h>
#include <string>
#ifdef HAVE_TRIPLEDRAGON #ifdef HAVE_TRIPLEDRAGON
#include <lcddisplay/fontrenderer.h> #include <lcddisplay/fontrenderer.h>
@@ -149,7 +147,6 @@ class CLCD
bool showclock; bool showclock;
bool movie_centered; bool movie_centered;
bool movie_is_ac3; bool movie_is_ac3;
CConfigFile configfile;
pthread_t thrTime; pthread_t thrTime;
bool thread_started; bool thread_started;
int last_toggle_state_power; int last_toggle_state_power;

3
src/driver/shutdown_count.cpp
View File

@@ -4,7 +4,7 @@
Copyright (C) 2001 Steffen Hehn 'McClean' Copyright (C) 2001 Steffen Hehn 'McClean'
Homepage: http://dbox.cyberphoria.org/ Homepage: http://dbox.cyberphoria.org/
Copyright (C) 2012 Stefan Seyfried Copyright (C) 2012-2013 Stefan Seyfried
License: GPL License: GPL
@@ -40,7 +40,6 @@
SHTDCNT::SHTDCNT() SHTDCNT::SHTDCNT()
: configfile('\t')
{ {
thread_running = false; thread_running = false;
} }

4
src/driver/shutdown_count.h
View File

@@ -4,7 +4,7 @@
Copyright (C) 2001 Steffen Hehn 'McClean' Copyright (C) 2001 Steffen Hehn 'McClean'
Homepage: http://dbox.cyberphoria.org/ Homepage: http://dbox.cyberphoria.org/
Copyright (C) 2012 Stefan Seyfried Copyright (C) 2012-2013 Stefan Seyfried
License: GPL License: GPL
@@ -26,7 +26,6 @@
#ifndef __shutdown_count__ #ifndef __shutdown_count__
#define __shutdown_count__ #define __shutdown_count__
#include <configfile.h>
#include <pthread.h> #include <pthread.h>
class SHTDCNT class SHTDCNT
@@ -37,7 +36,6 @@ class SHTDCNT
bool thread_running; bool thread_running;
unsigned int shutdown_cnt; unsigned int shutdown_cnt;
unsigned int sleep_cnt; unsigned int sleep_cnt;
CConfigFile configfile;
void shutdown_counter(); void shutdown_counter();
SHTDCNT(); SHTDCNT();