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

movieplayer: align some variables names to tango's names

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 28fbb16cf9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-30 (Mon, 30 Oct 2017)

Origin message was:
------------------
- movieplayer: align some variables names to tango's names

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-30 01:44:01 +01:00
parent 25f2d18368
commit 05ca99601a
5 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/filebrowser.cpp
View File

@@ -928,7 +928,7 @@ bool CFileBrowser::exec(const char * const dirname)
return res; return res;
} }
bool CFileBrowser::playlist_manager(CFileList &playlist, unsigned int playing, bool is_audio_player) bool CFileBrowser::playlist_manager(CFileList &playlist, unsigned int playing, bool is_audio_playing)
{ {
neutrino_msg_t msg; neutrino_msg_t msg;
neutrino_msg_data_t data; neutrino_msg_data_t data;
@@ -1065,7 +1065,7 @@ bool CFileBrowser::playlist_manager(CFileList &playlist, unsigned int playing, b
addfiles->Hide_records = true; addfiles->Hide_records = true;
addfiles->Multi_Select = true; addfiles->Multi_Select = true;
addfiles->Dirs_Selectable = true; addfiles->Dirs_Selectable = true;
addfiles->exec(is_audio_player ? g_settings.network_nfs_audioplayerdir.c_str() : g_settings.network_nfs_moviedir.c_str()); addfiles->exec(is_audio_playing ? g_settings.network_nfs_audioplayerdir.c_str() : g_settings.network_nfs_moviedir.c_str());
CFileList tmplist = addfiles->getSelectedFiles(); CFileList tmplist = addfiles->getSelectedFiles();
filelist.insert( filelist.end(), tmplist.begin(), tmplist.end() ); filelist.insert( filelist.end(), tmplist.begin(), tmplist.end() );
tmplist.clear(); tmplist.clear();

2
src/gui/filebrowser.h
View File

@@ -220,7 +220,7 @@ class CFileBrowser
~CFileBrowser(); ~CFileBrowser();
bool exec(const char * const dirname); bool exec(const char * const dirname);
bool playlist_manager(CFileList &playlist, unsigned int playing, bool is_audio_player = false); bool playlist_manager(CFileList &playlist, unsigned int playing, bool is_audio_playing = false);
CFile *getSelectedFile(); CFile *getSelectedFile();
inline const CFileList & getSelectedFiles(void) const inline const CFileList & getSelectedFiles(void) const

2
src/gui/infoviewer.cpp
View File

@@ -965,7 +965,7 @@ void CInfoViewer::setInfobarTimeout(int timeout_ext)
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] + timeout_ext); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] + timeout_ext);
break; break;
case NeutrinoMessages::mode_ts: case NeutrinoMessages::mode_ts:
if (CMoviePlayerGui::getInstance().IsAudioPlayer()) if (CMoviePlayerGui::getInstance().IsAudioPlaying())
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_AUDIO] + timeout_ext); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_AUDIO] + timeout_ext);
else else
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_VIDEO] + timeout_ext); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_VIDEO] + timeout_ext);

31
src/gui/movieplayer.cpp
View File

@@ -188,6 +188,7 @@ void CMoviePlayerGui::Init(void)
stopped = true; stopped = true;
currentVideoSystem = -1; currentVideoSystem = -1;
currentOsdResolution = 0; currentOsdResolution = 0;
is_audio_playing = false;
frameBuffer = CFrameBuffer::getInstance(); frameBuffer = CFrameBuffer::getInstance();
@@ -315,9 +316,6 @@ void CMoviePlayerGui::cutNeutrino()
g_Zapit->setStandby(true); g_Zapit->setStandby(true);
#endif #endif
if (is_audio_player)
frameBuffer->showFrame("mp3.jpg");
m_LastMode = (CNeutrinoApp::getInstance()->getMode() /*| NeutrinoMessages::norezap*/); m_LastMode = (CNeutrinoApp::getInstance()->getMode() /*| NeutrinoMessages::norezap*/);
if (isWebTV) if (isWebTV)
m_LastMode |= NeutrinoMessages::norezap; m_LastMode |= NeutrinoMessages::norezap;
@@ -431,13 +429,13 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
} }
#endif #endif
else if (actionKey == "fileplayback_video") { else if (actionKey == "fileplayback_video") {
is_audio_player = false; is_audio_playing = false;
if (filebrowser) if (filebrowser)
filebrowser->Filter = &filefilter_video; filebrowser->Filter = &filefilter_video;
//wakeup_hdd(g_settings.network_nfs_moviedir.c_str()); //wakeup_hdd(g_settings.network_nfs_moviedir.c_str());
} }
else if (actionKey == "fileplayback_audio") { else if (actionKey == "fileplayback_audio") {
is_audio_player = true; is_audio_playing = true;
if (filebrowser) if (filebrowser)
filebrowser->Filter = &filefilter_audio; filebrowser->Filter = &filefilter_audio;
//wakeup_hdd(g_settings.network_nfs_audioplayerdir.c_str()); //wakeup_hdd(g_settings.network_nfs_audioplayerdir.c_str());
@@ -691,7 +689,7 @@ void CMoviePlayerGui::ClearFlags()
isWebTV = false; isWebTV = false;
isYT = false; isYT = false;
is_file_player = false; is_file_player = false;
is_audio_player = false; is_audio_playing = false;
timeshift = TSHIFT_MODE_OFF; timeshift = TSHIFT_MODE_OFF;
} }
@@ -796,7 +794,7 @@ bool CMoviePlayerGui::SelectFile()
cookie_header.clear(); cookie_header.clear();
//reinit Path_local for webif reloadsetup //reinit Path_local for webif reloadsetup
Path_local = "/"; Path_local = "/";
if (is_audio_player) if (is_audio_playing)
{ {
if (!g_settings.network_nfs_audioplayerdir.empty()) if (!g_settings.network_nfs_audioplayerdir.empty())
Path_local = g_settings.network_nfs_audioplayerdir; Path_local = g_settings.network_nfs_audioplayerdir;
@@ -807,7 +805,7 @@ bool CMoviePlayerGui::SelectFile()
Path_local = g_settings.network_nfs_moviedir; Path_local = g_settings.network_nfs_moviedir;
} }
printf("CMoviePlayerGui::SelectFile: isBookmark %d timeshift %d isMovieBrowser %d is_audio_player %d\n", isBookmark, timeshift, isMovieBrowser, is_audio_player); printf("CMoviePlayerGui::SelectFile: isBookmark %d timeshift %d isMovieBrowser %d is_audio_playing %d\n", isBookmark, timeshift, isMovieBrowser, is_audio_playing);
//NI wakeup_hdd(g_settings.network_nfs_recordingdir.c_str()); //NI wakeup_hdd(g_settings.network_nfs_recordingdir.c_str());
if (timeshift != TSHIFT_MODE_OFF) { if (timeshift != TSHIFT_MODE_OFF) {
@@ -878,7 +876,7 @@ bool CMoviePlayerGui::SelectFile()
menu_ret = filebrowser->getMenuRet(); menu_ret = filebrowser->getMenuRet();
enableOsdElements(MUTE); enableOsdElements(MUTE);
} }
if (!is_audio_player) if (!is_audio_playing)
g_settings.network_nfs_moviedir = Path_local; g_settings.network_nfs_moviedir = Path_local;
return ret; return ret;
@@ -1448,6 +1446,15 @@ bool CMoviePlayerGui::PlayFileStart(void)
showStartingHint = true; showStartingHint = true;
pthread_create(&thrStartHint, NULL, CMoviePlayerGui::ShowStartHint, this); pthread_create(&thrStartHint, NULL, CMoviePlayerGui::ShowStartHint, this);
} }
if (filefilter_audio.matchFilter(file_name))
{
frameBuffer->showFrame("mp3.jpg");
is_audio_playing = true;
}
else
is_audio_playing = false;
bool res = playback->Start((char *) file_name.c_str(), vpid, vtype, currentapid, currentac3, duration); bool res = playback->Start((char *) file_name.c_str(), vpid, vtype, currentapid, currentac3, duration);
if (thrStartHint) { if (thrStartHint) {
@@ -1652,7 +1659,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
updateLcd(); updateLcd();
} }
if (first_start) { if (first_start) {
usleep(50000); usleep(80000);
callInfoViewer(); callInfoViewer();
first_start = false; first_start = false;
} }
@@ -1784,7 +1791,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
pfile = &(*filelist_it); pfile = &(*filelist_it);
int selected = std::distance( filelist.begin(), filelist_it ); int selected = std::distance( filelist.begin(), filelist_it );
filelist_it = filelist.end(); filelist_it = filelist.end();
if (playlist->playlist_manager(filelist, selected, is_audio_player)) if (playlist->playlist_manager(filelist, selected, is_audio_playing))
{ {
playstate = CMoviePlayerGui::STOPPED; playstate = CMoviePlayerGui::STOPPED;
CFile *sfile = NULL; CFile *sfile = NULL;
@@ -1878,7 +1885,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
CFile *pfile = NULL; CFile *pfile = NULL;
int selected = std::distance( filelist.begin(), filelist_it ); int selected = std::distance( filelist.begin(), filelist_it );
filelist_it = filelist.end(); filelist_it = filelist.end();
if (playlist->playlist_manager(filelist, selected, is_audio_player)) if (playlist->playlist_manager(filelist, selected, is_audio_playing))
{ {
playstate = CMoviePlayerGui::STOPPED; playstate = CMoviePlayerGui::STOPPED;
CFile *sfile = NULL; CFile *sfile = NULL;

4
src/gui/movieplayer.h
View File

@@ -189,7 +189,7 @@ class CMoviePlayerGui : public CMenuTarget
/* playback from file */ /* playback from file */
bool is_file_player; bool is_file_player;
bool is_audio_player; bool is_audio_playing;
bool iso_file; bool iso_file;
bool stopped; bool stopped;
CFileBrowser * filebrowser; CFileBrowser * filebrowser;
@@ -320,7 +320,7 @@ class CMoviePlayerGui : public CMenuTarget
void setLuaInfoFunc(lua_State* L, bool func) { luaState = L; haveLuaInfoFunc = func; }; void setLuaInfoFunc(lua_State* L, bool func) { luaState = L; haveLuaInfoFunc = func; };
void getLivestreamInfo(std::string *i1, std::string *i2) { *i1=livestreamInfo1; *i2=livestreamInfo2; }; void getLivestreamInfo(std::string *i1, std::string *i2) { *i1=livestreamInfo1; *i2=livestreamInfo2; };
bool getLiveUrl(const std::string &url, const std::string &script, std::string &realUrl, std::string &_pretty_name, std::string &info1, std::string &info2, std::string &header); bool getLiveUrl(const std::string &url, const std::string &script, std::string &realUrl, std::string &_pretty_name, std::string &info1, std::string &info2, std::string &header);
bool IsAudioPlayer() { return is_audio_player; }; bool IsAudioPlaying() { return is_audio_playing; };
}; };
#endif #endif