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

-add movieplayer icons to infoviewer

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@820 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-10-05 17:15:22 +00:00
parent 3d66446def
commit 34084de56f
4 changed files with 534 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1020
src/gui/infoviewer.cpp
View File

File diff suppressed because it is too large Load Diff

25
src/gui/infoviewer.h
View File

@@ -90,6 +90,17 @@ class CInfoViewer
uint32_t sec_timer_id;
uint32_t fadeTimer;
bool virtual_zap_mode;
int time_left_width;
int time_dot_width;
int time_width;
int time_height;
int info_time_width;
int bottom_bar_offset;
bool newfreq ;
char old_timestr[10];
static const short bar_width = 72;
CChannelEventList evtlist;
CChannelEventList::iterator eli;
@@ -111,12 +122,12 @@ class CInfoViewer
void showButton_SubServices();
void showIcon_16_9();
#ifndef SKIP_CA_STATUS
void showIcon_CA_Status(int);
void paint_ca_icons(int, char*, int&);
void paintCA_bar(int,int);
void showOne_CAIcon(bool);
#endif
void showIcon_VTXT() const;
void showRecordIcon(const bool show);
void showIcon_SubT() const;
@@ -128,15 +139,19 @@ class CInfoViewer
int showChannelLogo(const t_channel_id logo_channel_id);
void showSNR();
void showInfoFile();
void loop(int fadeValue, bool show_dot ,bool fadeIn);
std::string eventname;
void paintshowButtonBar();
void show_current_next(bool new_chan, int epgpos);
void reset_allScala();
void chack_channellogo_ca_SettingsChange();
public:
bool chanready;
bool is_visible;
uint32_t lcdUpdateTimer;
CInfoViewer();
void showMovieTitle( const int playState, const std::string Channel, const std::string g_file_epg, const std::string g_file_epg1);
void start();
void showEpgInfo();
@@ -146,9 +161,7 @@ class CInfoViewer
CSectionsdClient::CurrentNextInfo getEPG(const t_channel_id for_channel_id, CSectionsdClient::CurrentNextInfo &info);
void showSubchan();
#ifndef SKIP_CA_STATUS
void Set_CA_Status(int Status);
#endif
int handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data);
void clearVirtualZapMode() {virtual_zap_mode = false;}

7
src/gui/movieplayer.cpp
View File

@@ -1128,8 +1128,8 @@ void CMoviePlayerGui::PlayFile(void)
if (isMovieBrowser) {
g_file_epg = p_movie_info->epgTitle;
g_file_epg1 = p_movie_info->epgInfo1;
g_InfoViewer->showTitle(0, p_movie_info->epgChannel.c_str(), 0, 0); // UTF-8
//g_InfoViewer->showTitle(0, p_movie_info->epgChannel.c_str(), 0, 0); // UTF-8
g_InfoViewer->showMovieTitle(playstate, p_movie_info->epgChannel.c_str(), g_file_epg, g_file_epg1);
} else {
char temp_name[255];
const char *slash = strrchr(filename, '/');
@@ -1146,7 +1146,8 @@ void CMoviePlayerGui::PlayFile(void)
}
g_file_epg = "";
g_file_epg1 = "";
g_InfoViewer->showTitle(0, temp_name, 0, 0); // UTF-8
// g_InfoViewer->showTitle(0, temp_name, 0, 0); // UTF-8
g_InfoViewer->showMovieTitle(playstate, temp_name, g_file_epg, g_file_epg1); // UTF-8
}
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8);
update_lcd = true;

14
src/gui/widget/icons.h
View File

@@ -83,8 +83,10 @@
#define NEUTRINO_ICON_MP3 "mp3"
#define NEUTRINO_ICON_MULTIMEDIA "multimedia"
#define NEUTRINO_ICON_NOT_MOUNTED "not_mounted"
#define NEUTRINO_ICON_PAUSE "pause"
#define NEUTRINO_ICON_PLAY "play"
#define NEUTRINO_ICON_PAUSE "mp_pause"
#define NEUTRINO_ICON_PLAY "mp_play"
#define NEUTRINO_ICON_REW "mp_b-skip"
#define NEUTRINO_ICON_FF "mp_f-skip"
#define NEUTRINO_ICON_PROTECTING "protecting"
#define NEUTRINO_ICON_QUESTION "question"
#define NEUTRINO_ICON_RADIOMODE "radiomode"
@@ -135,20 +137,12 @@
#define NEUTRINO_ICON_RESOLUTION_352 "res_352"
#define NEUTRINO_ICON_RESOLUTION_288 "res_288"
#define NEUTRINO_ICON_RESOLUTION_000 "res_000"
#define DUMMY_ICON "dummy"
#define NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE "mute_zap_green"
#define NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE "mute_zap_gray"
/* icon widths */
#define NEUTRINO_ICON_BUTTON_BLUE_WIDTH 16
#define NEUTRINO_ICON_BUTTON_GREEN_WIDTH 16
#define NEUTRINO_ICON_BUTTON_RED_WIDTH 16
#define NEUTRINO_ICON_BUTTON_YELLOW_WIDTH 16
/* misc */