mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-27 23:42:58 +02:00
- pick graphlcd support from DDT but include it in another way
Conflicts: src/driver/Makefile.am src/driver/nglcd.cpp src/gui/Makefile.am src/gui/bouquetlist.cpp src/gui/channellist.cpp src/gui/osd_setup.cpp src/gui/widget/menue.cpp src/gui/widget/menue.h src/neutrino.cpp src/system/flashtool.cpp src/system/settings.h Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
@@ -49,7 +49,7 @@
|
||||
#include <system/fsmounter.h>
|
||||
#include <system/helpers.h>
|
||||
|
||||
|
||||
#include <driver/display.h>
|
||||
#include <driver/record.h>
|
||||
#include <driver/radiotext.h>
|
||||
#include <driver/streamts.h>
|
||||
@@ -1088,6 +1088,9 @@ bool CRecordManager::Record(const CTimerd::RecordingInfo * const eventinfo, cons
|
||||
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
|
||||
if(eventinfo->channel_id == live_channel_id)
|
||||
recordingstatus = 1;
|
||||
#endif
|
||||
#ifdef ENABLE_GRAPHLCD
|
||||
nGLCD::Update();
|
||||
#endif
|
||||
} else {
|
||||
delete inst;
|
||||
@@ -1290,6 +1293,9 @@ bool CRecordManager::Stop(const CTimerd::RecordingStopInfo * recinfo)
|
||||
if(inst != NULL && recinfo->eventID == inst->GetRecordingId()) {
|
||||
StopInstance(inst, false);
|
||||
ret = true;
|
||||
#ifdef ENABLE_GRAPHLCD
|
||||
nGLCD::Update();
|
||||
#endif
|
||||
} else {
|
||||
for(nextmap_iterator_t it = nextmap.begin(); it != nextmap.end(); it++) {
|
||||
if((*it)->eventID == recinfo->eventID) {
|
||||
|
Reference in New Issue
Block a user