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

Merge branch 'uncool/dvbsi++' commit '9d968280bac'

Browse Source 
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.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/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-07-22 14:09:43 +02:00
parent 2da175a159 9d968280ba
commit 3df9a6f7f5
354 changed files with 17604 additions and 32020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/global.h
View File

@@ -32,33 +32,27 @@
*/
#include <zapit/client/zapitclient.h>
#ifdef HAVE_CONTROLD
#include <controldclient/controldclient.h>
#endif
#include <sectionsdclient/sectionsdclient.h>
#include <timerdclient/timerdclient.h>
#include "driver/fontrenderer.h"
#include "driver/rcinput.h"
#include "driver/radiotext.h"
#include <driver/fontrenderer.h>
#include <driver/rcinput.h>
#include <driver/radiotext.h>
#if HAVE_COOL_HARDWARE
#include "driver/vfd.h"
#include "driver/rfmod.h"
#include <driver/vfd.h>
#endif
#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE || HAVE_AZBOX_HARDWARE
#include "driver/lcdd.h"
#define CVFD CLCD
#endif
#include "system/localize.h"
#include "system/settings.h"
#include <system/localize.h>
#include <system/settings.h>
#include "gui/epgview.h"
#include "gui/infoviewer.h"
#include "gui/eventlist.h"
#include "gui/videosettings.h"
#include <gui/epgview.h>
#include <gui/infoviewer.h>
#include <gui/eventlist.h>
#include <gui/videosettings.h>
#ifndef NEUTRINO_CPP
@@ -97,12 +91,9 @@ NEUTRINO_CPP CRCInput *g_RCInput;
NEUTRINO_CPP CEpgData *g_EpgData;
NEUTRINO_CPP CInfoViewer *g_InfoViewer;
NEUTRINO_CPP EventList *g_EventList;
NEUTRINO_CPP CNeutrinoEventList *g_EventList;
NEUTRINO_CPP CLocaleManager *g_Locale;
#if HAVE_COOL_HARDWARE
NEUTRINO_CPP RFmod *g_RFmod;
#endif
NEUTRINO_CPP CVideoSettings *g_videoSettings;
NEUTRINO_CPP CRadioText *g_Radiotext;