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

movieplayer: rework player handling

Browse Source 
Signed-off-by: GetAway <get-away@t-online.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: df27866642
Author: Thilo Graf <dbt@novatux.de>
Date: 2023-09-02 (Sat, 02 Sep 2023)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2023-09-02 20:58:26 +02:00
committed by vanhofen
parent 32a579511d
commit 7a02f3e3f0
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/movieplayer.cpp
View File

@@ -169,8 +169,8 @@ void CMoviePlayerGui::Init(void)
frameBuffer = CFrameBuffer::getInstance(); frameBuffer = CFrameBuffer::getInstance();
if (playback == NULL) // init playback instance
playback = new cPlayback(0); playback = getPlayback();
#if HAVE_CST_HARDWARE #if HAVE_CST_HARDWARE
videoDecoder->setPlaybackPtr(playback); videoDecoder->setPlaybackPtr(playback);
#endif #endif
@@ -3544,3 +3544,11 @@ size_t CMoviePlayerGui::GetReadCount()
//printf("GetReadCount: %lld\n", res); //printf("GetReadCount: %lld\n", res);
return (size_t) res; return (size_t) res;
} }
cPlayback *CMoviePlayerGui::getPlayback()
{
if (playback == NULL) // mutex needed ?
playback = new cPlayback(0);
return playback;
}

2
src/gui/movieplayer.h
View File

@@ -277,7 +277,7 @@ class CMoviePlayerGui : public CMenuTarget
void deleteTimeshift() { timeshift_deletion = true; } void deleteTimeshift() { timeshift_deletion = true; }
void moveTimeshift() { timeshift_to_record = true; } void moveTimeshift() { timeshift_to_record = true; }
int file_prozent; int file_prozent;
cPlayback *getPlayback() { return playback; } static cPlayback *getPlayback();
void SetFile(std::string &name, std::string &file, std::string info1="", std::string info2="", std::string file2="") { pretty_name = name; file_name = file; info_1 = info1; info_2 = info2; second_file_name = file2; } void SetFile(std::string &name, std::string &file, std::string info1="", std::string info2="", std::string file2="") { pretty_name = name; file_name = file; info_1 = info1; info_2 = info2; second_file_name = file2; }
bool PlayBackgroundStart(const std::string &file, const std::string &name, t_channel_id chan, const std::string &script=""); bool PlayBackgroundStart(const std::string &file, const std::string &name, t_channel_id chan, const std::string &script="");
void stopPlayBack(void); void stopPlayBack(void);