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

Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0'

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
This commit is contained in:
Stefan Seyfried
2012-07-22 14:09:43 +02:00
parent b04ab099b2 6e0bc85a6c
commit ae1b98aa38
354 changed files with 17604 additions and 32020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/gui/infoviewer.h
View File

@@ -41,15 +41,18 @@
#include <driver/fade.h>
#include <system/settings.h>
#include "widget/menue.h"
#include <gui/infoviewer_bb.h>
#include <gui/widget/progressbar.h>
#include <string>
#include <zapit/channel.h>
class CInfoViewer
{
private:
void Init(void);
CFrameBuffer * frameBuffer;
CInfoViewerBB* infoViewerBB;
bool gotTime;
bool recordModeActive;
#ifndef SKIP_CA_STATUS
@@ -57,12 +60,8 @@ class CInfoViewer
#endif
int InfoHeightY;
int InfoHeightY_Info;
bool showButtonBar;
bool fileplay;
int BoxEndX;
int BoxEndY;
int BoxStartX;
int BoxStartY;
int ButtonWidth;
@@ -81,22 +80,10 @@ class CInfoViewer
int ChanNameY;
int ChanWidth;
int ChanHeight;
int ChanInfoX;
/* the position of the button bar */
int BBarY;
int BBarIconY;
int BBarFontY;
int asize;
int icol_w, icol_h;
int icon_large_width, icon_small_width, icon_xres_width, icon_crypt_width;
CSectionsdClient::CurrentNextInfo info_CurrentNext;
t_channel_id channel_id;
char aspectRatio;
uint32_t sec_timer_id;
//uint32_t fadeTimer;
COSDFader fader;
@@ -105,7 +92,6 @@ class CInfoViewer
int time_width;
int time_height;
int info_time_width;
int bottom_bar_offset;
bool newfreq ;
char old_timestr[10];
@@ -117,9 +103,8 @@ class CInfoViewer
CChannelEventList evtlist;
CChannelEventList::iterator eli;
int lastsnr, lastsig, lasthdd, lastvar, lasttime;
CProgressBar *snrscale, *sigscale, *hddscale, *varscale, *timescale;
int hddwidth;
int lastsnr, lastsig, lasttime;
CProgressBar *snrscale, *sigscale, *timescale;
bool casysChange;
bool channellogoChange;
void paintBackground(int col_Numbox);
@@ -131,43 +116,38 @@ class CInfoViewer
bool update_current = true, bool update_next = true);
void paintTime( bool show_dot, bool firstPaint );
void showButton_Audio();
void showButton_SubServices();
void showIcon_16_9();
void showIcon_RadioText(bool rt_available) const;
void showIcon_CA_Status(int);
void paint_ca_icons(int, char*, int&);
void paintCA_bar(int,int);
void showOne_CAIcon(bool);
void showIcon_VTXT() const;
void showRecordIcon(const bool show);
void showIcon_SubT() const;
void showIcon_Resolution() const;
void showIcon_Tuner() const;
void showFailure();
void showMotorMoving(int duration);
void showLcdPercentOver();
int showChannelLogo(const t_channel_id logo_channel_id, const int channel_number_width);
void showSNR();
void showRadiotext();
void killRadiotext();
void showInfoFile();
//void loop(int fadeValue, bool show_dot ,bool fadeIn);
void loop(bool show_dot);
std::string eventname;
void paintshowButtonBar();
void show_current_next(bool new_chan, int epgpos);
void reset_allScala();
void check_channellogo_ca_SettingsChange();
public:
bool chanready;
bool is_visible;
bool virtual_zap_mode;
uint32_t lcdUpdateTimer;
bool chanready;
bool is_visible;
bool virtual_zap_mode;
uint32_t lcdUpdateTimer;
char aspectRatio;
uint32_t sec_timer_id;
int BoxEndX;
int BoxEndY;
int ChanInfoX;
bool showButtonBar;
CInfoViewer();
~CInfoViewer();
void showMovieTitle(const int playState, const std::string &title,
const std::string &g_file_epg, const std::string &g_file_epg1,
const int duration, const int curr_pos);
@@ -175,20 +155,24 @@ class CInfoViewer
void start();
void showEpgInfo();
void showTitle(const int ChanNum, const std::string & Channel, const t_satellite_position satellitePosition, const t_channel_id new_channel_id = 0, const bool calledFromNumZap = false, int epgpos = 0); // Channel must be UTF-8 encoded
void showTitle(CZapitChannel * channel, const bool calledFromNumZap = false, int epgpos = 0);
void showTitle(t_channel_id channel_id, const bool calledFromNumZap = false, int epgpos = 0);
void lookAheadEPG(const int ChanNum, const std::string & Channel, const t_channel_id new_channel_id = 0, const bool calledFromNumZap = false); //alpha: fix for nvod subchannel update
void killTitle();
void getEPG(const t_channel_id for_channel_id, CSectionsdClient::CurrentNextInfo &info);
CSectionsdClient::CurrentNextInfo getCurrentNextInfo() const { return info_CurrentNext; }
void showSubchan();
void Set_CA_Status(int Status);
//void Set_CA_Status(int Status);
int handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data);
void clearVirtualZapMode() {virtual_zap_mode = false;}
void changePB();
bool SDT_freq_update;
void changePB();
void showSNR();
void Init(void);
bool SDT_freq_update;
};
#if 0
class CInfoViewerHandler : public CMenuTarget
{
public:
@@ -197,3 +181,4 @@ class CInfoViewerHandler : public CMenuTarget
};
#endif
#endif