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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/lcdd.h
	src/driver/rcinput.cpp
	src/driver/rcinput.h
	src/driver/screenshot.cpp
	src/driver/screenshot.h
	src/driver/simple_display.cpp
	src/driver/vfd.cpp
	src/gui/audio_select.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/zapit/include/zapit/capmt.h
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fa735aa45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-03 00:09:05 +01:00
parent 9a0da88254 b6f38bd351
commit 55daa20bed
29 changed files with 1496 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gui/movieplayer.cpp
View File

@@ -95,10 +95,8 @@ bool glcd_play = false;
#include <system/stacktrace.h>
#ifndef HAVE_COOL_HARDWARE
#define LCD_MODE CVFD::MODE_MOVIE
#else
#define LCD_MODE CVFD::MODE_MENU_UTF8
#if 0
#include <gui/infoicons.h>
#endif
//NI InfoIcons
@@ -806,8 +804,9 @@ bool CMoviePlayerGui::SelectFile()
}
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());
#if 0
wakeup_hdd(g_settings.network_nfs_recordingdir.c_str());
#endif
if (timeshift != TSHIFT_MODE_OFF) {
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
p_movie_info = CRecordManager::getInstance()->GetMovieInfo(live_channel_id);
@@ -1936,6 +1935,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
playback->SetSpeed(speed);
}
updateLcd();
//NI if (timeshift == TSHIFT_MODE_OFF)
callInfoViewer();
} else if (msg == (neutrino_msg_t) g_settings.mpkey_bookmark) {
@@ -2356,12 +2356,14 @@ void CMoviePlayerGui::callInfoViewer(bool init_vzap_it)
g_InfoViewer->showMovieTitle(playstate, mi->epgId >>16, channelName, mi->epgTitle, mi->epgInfo1,
duration, position, repeat_mode, init_vzap_it ? 0 /*IV_MODE_DEFAULT*/ : 1 /*IV_MODE_VIRTUAL_ZAP*/);
unlink("/tmp/cover.jpg");
return;
}
/* not moviebrowser => use the filename as title */
CVFD::getInstance()->ShowText(pretty_name.c_str());
g_InfoViewer->showMovieTitle(playstate, 0, pretty_name, info_1, info_2, duration, position, repeat_mode);
unlink("/tmp/cover.jpg");
}
bool CMoviePlayerGui::getAudioName(int apid, std::string &apidtitle)
@@ -2853,6 +2855,27 @@ void CMoviePlayerGui::StopSubtitles(bool enable_glcd_mirroring __attribute__((un
#endif
}
void CMoviePlayerGui::StopSubtitles(bool enable_glcd_mirroring __attribute__((unused)))
{
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
printf("[CMoviePlayerGui] %s\n", __FUNCTION__);
int ttx, ttxpid, ttxpage;
int current_sub = playback->GetSubtitlePid();
if (current_sub > -1)
dvbsub_pause();
tuxtx_subtitle_running(&ttxpid, &ttxpage, &ttx);
if (ttx) {
tuxtx_pause_subtitle(true);
frameBuffer->paintBackground();
}
#ifdef ENABLE_GRAPHLCD
if (enable_glcd_mirroring)
nGLCD::MirrorOSD(g_settings.glcd_mirror_osd);
#endif
#endif
}
void CMoviePlayerGui::showHelp()
{
Helpbox helpbox(g_Locale->getText(LOCALE_MESSAGEBOX_INFO));
@@ -3569,7 +3592,11 @@ void CMoviePlayerGui::makeScreenShot(bool autoshot, bool forcover)
sc->SetSize(w, h);
}
}
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
sc->Start("-r 320 -j 75");
#else
sc->Start();
#endif
if (autoshot)
autoshot_done = true;
}