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

movieplayer.cpp: fix current pid in case of file play

Browse Source
This commit is contained in:
satbaby
2012-10-17 22:54:45 +02:00
parent 3fd2a73d77
commit 7580d928f3
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/movieplayer.cpp
View File

@@ -726,6 +726,7 @@ bool CMoviePlayerGui::getAudioName(int apid, std::string &apidtitle)
void CMoviePlayerGui::addAudioFormat(int count, std::string &apidtitle, bool file_player, bool& enabled) void CMoviePlayerGui::addAudioFormat(int count, std::string &apidtitle, bool file_player, bool& enabled)
{ {
enabled = true;
switch(ac3flags[count]) switch(ac3flags[count])
{ {
case 1: /*AC3,EAC3*/ case 1: /*AC3,EAC3*/
@@ -761,7 +762,6 @@ void CMoviePlayerGui::getCurrentAudioName( bool file_player, std::string &audion
{ {
if(file_player && !numpida){ if(file_player && !numpida){
playback->FindAllPids(apids, ac3flags, &numpida, language); playback->FindAllPids(apids, ac3flags, &numpida, language);
/* fix current pid in case of file play */
if(numpida) if(numpida)
currentapid = apids[0]; currentapid = apids[0];
} }
@@ -775,12 +775,20 @@ void CMoviePlayerGui::getCurrentAudioName( bool file_player, std::string &audion
}else if (!language[count].empty()){ }else if (!language[count].empty()){
audioname = language[count]; audioname = language[count];
addAudioFormat(count, audioname, file_player, dumm); addAudioFormat(count, audioname, file_player, dumm);
if(!dumm && (count < numpida)){
currentapid = apids[count+1];
continue;
}
return ; return ;
} }
char apidnumber[20]; char apidnumber[20];
sprintf(apidnumber, "Stream %d %X", count + 1, apids[count]); sprintf(apidnumber, "Stream %d %X", count + 1, apids[count]);
audioname = apidnumber; audioname = apidnumber;
addAudioFormat(count, audioname, file_player, dumm); addAudioFormat(count, audioname, file_player, dumm);
if(!dumm && (count < numpida)){
currentapid = apids[count+1];
continue;
}
return ; return ;
} }
} }
@@ -796,7 +804,6 @@ void CMoviePlayerGui::selectAudioPid(bool file_player)
if(file_player && !numpida){ if(file_player && !numpida){
playback->FindAllPids(apids, ac3flags, &numpida, language); playback->FindAllPids(apids, ac3flags, &numpida, language);
/* fix current pid in case of file play */
if(numpida) if(numpida)
currentapid = apids[0]; currentapid = apids[0];
} }
@@ -819,6 +826,10 @@ void CMoviePlayerGui::selectAudioPid(bool file_player)
apidtitle = apidnumber; apidtitle = apidnumber;
} }
addAudioFormat(count, apidtitle, file_player, enabled); addAudioFormat(count, apidtitle, file_player, enabled);
if(defpid && !enabled && (count < numpida)){
currentapid = apids[count+1];
defpid = false;
}
char cnt[5]; char cnt[5];
sprintf(cnt, "%d", count); sprintf(cnt, "%d", count);