mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

- movieplayer: remove unused 3d-code

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>

# Conflicts:
#	src/gui/movieplayer.cpp
This commit is contained in:
svenhoefer
2017-12-27 23:26:01 +01:00
committed by Thilo Graf
parent 55b49bebd9
commit f528899cdb
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/movieplayer.cpp
View File

@@ -1364,21 +1364,9 @@ bool CMoviePlayerGui::PlayFileStart(void)
duration = p_movie_info->length * 60 * 1000; duration = p_movie_info->length * 60 * 1000;
int percent = CZapit::getInstance()->GetPidVolume(p_movie_info->channelId, currentapid, currentac3 == 1); int percent = CZapit::getInstance()->GetPidVolume(p_movie_info->channelId, currentapid, currentac3 == 1);
CZapit::getInstance()->SetVolumePercent(percent); CZapit::getInstance()->SetVolumePercent(percent);
#if HAVE_SPARK_HARDWARE
CScreenSetup cSS;
cSS.showBorder(p_movie_info->epgId);
#endif
} else {
#if HAVE_SPARK_HARDWARE
CScreenSetup cSS;
cSS.showBorder(0);
#endif
} }
file_prozent = 0; file_prozent = 0;
#if HAVE_SPARK_HARDWARE
old3dmode = frameBuffer->get3DMode();
#endif
pthread_t thrStartHint = 0; pthread_t thrStartHint = 0;
if (is_file_player) { if (is_file_player) {
showStartingHint = true; showStartingHint = true;
@@ -1788,14 +1776,10 @@ void CMoviePlayerGui::PlayFileLoop(void)
repeat_mode = REPEAT_OFF; repeat_mode = REPEAT_OFF;
g_settings.movieplayer_repeat_on = repeat_mode; g_settings.movieplayer_repeat_on = repeat_mode;
callInfoViewer(); callInfoViewer();
#if HAVE_SPARK_HARDWARE
} else if (msg == (neutrino_msg_t) g_settings.mpkey_next3dmode) {
frameBuffer->set3DMode((CFrameBuffer::Mode3D)(((frameBuffer->get3DMode()) + 1) % CFrameBuffer::Mode3D_SIZE));
} else if (msg == (neutrino_msg_t) g_settings.key_next43mode) { } else if (msg == (neutrino_msg_t) g_settings.key_next43mode) {
g_videoSettings->next43Mode(); g_videoSettings->next43Mode();
} else if (msg == (neutrino_msg_t) g_settings.key_switchformat) { } else if (msg == (neutrino_msg_t) g_settings.key_switchformat) {
g_videoSettings->SwitchFormat(); g_videoSettings->SwitchFormat();
#endif
} else if (msg == (neutrino_msg_t) g_settings.mpkey_play && handle_key_play) { } else if (msg == (neutrino_msg_t) g_settings.mpkey_play && handle_key_play) {
if (time_forced) { if (time_forced) {
time_forced = false; time_forced = false;
@@ -2171,11 +2155,6 @@ void CMoviePlayerGui::PlayFileEnd(bool restore)
playback->SetSpeed(1); playback->SetSpeed(1);
playback->Close(); playback->Close();
#if HAVE_SPARK_HARDWARE
frameBuffer->set3DMode(old3dmode);
CScreenSetup cSS;
cSS.showBorder(CZapit::getInstance()->GetCurrentChannelID());
#endif
if (iso_file) { if (iso_file) {
iso_file = false; iso_file = false;
if (umount2(ISO_MOUNT_POINT, MNT_FORCE)) if (umount2(ISO_MOUNT_POINT, MNT_FORCE))

3
src/gui/movieplayer.h
View File

@@ -180,9 +180,6 @@ class CMoviePlayerGui : public CMenuTarget
MI_MOVIE_INFO movie_info; MI_MOVIE_INFO movie_info;
P_MI_MOVIE_LIST milist; P_MI_MOVIE_LIST milist;
const static short MOVIE_HINT_BOX_TIMER = 5; // time to show bookmark hints in seconds const static short MOVIE_HINT_BOX_TIMER = 5; // time to show bookmark hints in seconds
#if HAVE_SPARK_HARDWARE
CFrameBuffer::Mode3D old3dmode;
#endif
/* playback from file */ /* playback from file */
bool is_file_player; bool is_file_player;