From ac97ccbf3990cd79a351da395ffffd41c56de5b3 Mon Sep 17 00:00:00 2001 From: satbaby Date: Fri, 28 Jan 2011 09:47:17 +0000 Subject: [PATCH] reduce globales git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1079 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/movieplayer.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/gui/movieplayer.h b/src/gui/movieplayer.h index 116ca9c65..94941b0cd 100644 --- a/src/gui/movieplayer.h +++ b/src/gui/movieplayer.h @@ -42,6 +42,8 @@ #include "gui/moviebrowser.h" #include "gui/movieinfo.h" #include +#include +#include #include @@ -94,6 +96,10 @@ class CMoviePlayerGui : public CMenuTarget std::string Path_vlc_settings; std::string g_file_epg; std::string g_file_epg1; + static unsigned short g_numpida; + static unsigned short g_vtype; + static unsigned short g_vpid; + static std::string g_language[REC_MAX_APIDS]; CFileBrowser * filebrowser; CMovieBrowser* moviebrowser; @@ -113,9 +119,11 @@ class CMoviePlayerGui : public CMenuTarget void showHelpVLC(void); void callInfoViewer(const std::string & epg_title, const std::string & epg_info1, const std::string & epg_channel, const int duration, const int pos); - + static CMoviePlayerGui* instance_mp; + static cPlayback *playback; CMoviePlayerGui(const CMoviePlayerGui&) {}; + const static short MOVIE_HINT_BOX_TIMER = 5; // time to show bookmark hints in seconds public: CMoviePlayerGui(); @@ -136,6 +144,9 @@ class CAPIDSelectExec : public CMenuTarget { public: int exec(CMenuTarget* parent, const std::string & actionKey); + static unsigned short g_apids[REC_MAX_APIDS]; + static unsigned short g_ac3flags[REC_MAX_APIDS]; + static unsigned short g_currentapid, g_currentac3, apidchanged; }; #endif