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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d52b3c110
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-06 (Mon, 06 Nov 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2017-11-06 11:12:38 +01:00
parent 4c5d9e8440 10d5efa502
commit 2b7b768d2d
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/movieplayer.cpp
View File

@@ -1478,9 +1478,11 @@ bool CMoviePlayerGui::PlayFileStart(void)
repeat_mode = REPEAT_OFF;
return false;
} else {
numpida = REC_MAX_APIDS;
numpida = 0;
playback->FindAllPids(apids, ac3flags, &numpida, language);
if (p_movie_info)
if (p_movie_info){
if(!numpida && !p_movie_info->audioPids.empty())
numpida = p_movie_info->audioPids.size();
for (unsigned int i = 0; i < numpida; i++) {
unsigned int j, asize = p_movie_info->audioPids.size();
for (j = 0; j < asize && p_movie_info->audioPids[j].AudioPid != apids[i]; j++);
@@ -1493,12 +1495,13 @@ bool CMoviePlayerGui::PlayFileStart(void)
p_movie_info->audioPids.push_back(pids);
}
}
else
}else{
for (unsigned int i = 0; i < numpida; i++)
if (apids[i] == playback->GetAPid()) {
CZapit::getInstance()->SetVolumePercent((ac3flags[i] == 1) ? g_settings.audio_volume_percent_ac3 : g_settings.audio_volume_percent_pcm);
break;
}
}
repeat_mode = (repeat_mode_enum) g_settings.movieplayer_repeat_on;
playstate = CMoviePlayerGui::PLAY;
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
@@ -2382,7 +2385,7 @@ bool CMoviePlayerGui::getAudioName(int apid, std::string &apidtitle)
{
if (p_movie_info == NULL)
{
numpida = REC_MAX_APIDS;
numpida = 0;
playback->FindAllPids(apids, ac3flags, &numpida, language);
for (unsigned int count = 0; count < numpida; count++)
if(apid == apids[count]){
@@ -2394,7 +2397,7 @@ bool CMoviePlayerGui::getAudioName(int apid, std::string &apidtitle)
{
if (!isMovieBrowser)
{
numpida = REC_MAX_APIDS;
numpida = 0;
playback->FindAllPids(apids, ac3flags, &numpida, language);
for (unsigned int count = 0; count < numpida; count++)
if(apid == apids[count]){
@@ -2452,10 +2455,12 @@ void CMoviePlayerGui::addAudioFormat(int count, std::string &apidtitle, bool& en
}
}
void CMoviePlayerGui::getCurrentAudioName(bool /* file_player */, std::string &audioname)
void CMoviePlayerGui::getCurrentAudioName(bool file_player, std::string &audioname)
{
numpida = REC_MAX_APIDS;
playback->FindAllPids(apids, ac3flags, &numpida, language);
if (file_player) {
numpida = 0;
playback->FindAllPids(apids, ac3flags, &numpida, language);
}
if (numpida && !currentapid)
currentapid = apids[0];
for (unsigned int count = 0; count < numpida; count++)
@@ -3299,8 +3304,11 @@ unsigned int CMoviePlayerGui::getAPID(void)
unsigned int CMoviePlayerGui::getAPIDCount(void)
{
if (!is_file_player && numpida)
return numpida;
unsigned int count = 0;
numpida = REC_MAX_APIDS;
numpida = 0;
playback->FindAllPids(apids, ac3flags, &numpida, language);
for (unsigned int i = 0; i < numpida; i++) {
if (i != count) {