From 897a8293cdd19bffa56f2447d59fa2f6cfd3cdc6 Mon Sep 17 00:00:00 2001 From: focus Date: Thu, 8 Dec 2011 16:26:08 +0000 Subject: [PATCH] Pass reference to showMovieTitle; Fix function name git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1959 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/infoviewer.cpp | 10 +++++----- src/gui/infoviewer.h | 6 +++--- src/gui/movieplayer.cpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 6dd5369ae..df7acac9b 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -539,11 +539,11 @@ void CInfoViewer::show_current_next(bool new_chan, int epgpos) } } -void CInfoViewer::showMovieTitle(const int playState, const std::string Channel, - const std::string g_file_epg, const std::string g_file_epg1, +void CInfoViewer::showMovieTitle(const int playState, const std::string &Channel, + const std::string &g_file_epg, const std::string &g_file_epg1, const int duration, const int curr_pos) { - chack_channellogo_ca_SettingsChange(); + check_channellogo_ca_SettingsChange(); aspectRatio = 0; last_curr_id = last_next_id = 0; showButtonBar = true; @@ -645,7 +645,7 @@ void CInfoViewer::reset_allScala() lastsig = lastsnr = lasthdd = lastvar = -1; } -void CInfoViewer::chack_channellogo_ca_SettingsChange() +void CInfoViewer::check_channellogo_ca_SettingsChange() { if (casysChange != g_settings.casystem_display || channellogoChange != g_settings.infobar_show_channellogo) { casysChange = g_settings.casystem_display; @@ -661,7 +661,7 @@ void CInfoViewer::chack_channellogo_ca_SettingsChange() void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, const t_satellite_position satellitePosition, const t_channel_id new_channel_id, const bool calledFromNumZap, int epgpos) { - chack_channellogo_ca_SettingsChange(); + check_channellogo_ca_SettingsChange(); aspectRatio = 0; last_curr_id = last_next_id = 0; showButtonBar = !calledFromNumZap; diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h index 21586833a..fca649661 100644 --- a/src/gui/infoviewer.h +++ b/src/gui/infoviewer.h @@ -159,7 +159,7 @@ class CInfoViewer void paintshowButtonBar(); void show_current_next(bool new_chan, int epgpos); void reset_allScala(); - void chack_channellogo_ca_SettingsChange(); + void check_channellogo_ca_SettingsChange(); public: bool chanready; bool is_visible; @@ -167,8 +167,8 @@ class CInfoViewer uint32_t lcdUpdateTimer; CInfoViewer(); - void showMovieTitle(const int playState, const std::string title, - const std::string g_file_epg, const std::string g_file_epg1, + 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); void start(); diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 622462036..6e3e48705 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1353,7 +1353,7 @@ void CMoviePlayerGui::callInfoViewer(const std::string & epg_title, const std::s const std::string & epg_channel, const int duration, const int curr_pos) { if (isMovieBrowser) { - g_InfoViewer->showMovieTitle(playstate, epg_channel.c_str(), epg_title, epg_info1, + g_InfoViewer->showMovieTitle(playstate, epg_channel, epg_title, epg_info1, duration, curr_pos); return; }