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

- movieinfo: internally rename epgAudioPid -> AudioPid

Browse Source
This commit is contained in:
vanhofen
2016-09-09 18:58:11 +02:00
committed by svenhoefer
parent c1feaad8fa
commit c5dcb1c4f6
5 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/movieplayer.cpp
View File

@@ -403,18 +403,18 @@ void CMoviePlayerGui::fillPids()
numpida = 0; currentapid = 0;
/* FIXME: better way to detect TS recording */
if (!p_movie_info->audioPids.empty()) {
currentapid = p_movie_info->audioPids[0].epgAudioPid;
currentapid = p_movie_info->audioPids[0].AudioPid;
currentac3 = p_movie_info->audioPids[0].atype;
} else if (!vpid) {
is_file_player = true;
return;
}
for (int i = 0; i < (int)p_movie_info->audioPids.size(); i++) {
apids[i] = p_movie_info->audioPids[i].epgAudioPid;
apids[i] = p_movie_info->audioPids[i].AudioPid;
ac3flags[i] = p_movie_info->audioPids[i].atype;
numpida++;
if (p_movie_info->audioPids[i].selected) {
currentapid = p_movie_info->audioPids[i].epgAudioPid;
currentapid = p_movie_info->audioPids[i].AudioPid;
currentac3 = p_movie_info->audioPids[i].atype;
}
}
@@ -1715,8 +1715,8 @@ bool CMoviePlayerGui::getAudioName(int apid, std::string &apidtitle)
return false;
for (int i = 0; i < (int)p_movie_info->audioPids.size(); i++) {
if (p_movie_info->audioPids[i].epgAudioPid == apid && !p_movie_info->audioPids[i].epgAudioPidName.empty()) {
apidtitle = p_movie_info->audioPids[i].epgAudioPidName;
if (p_movie_info->audioPids[i].AudioPid == apid && !p_movie_info->audioPids[i].AudioPidName.empty()) {
apidtitle = p_movie_info->audioPids[i].AudioPidName;
return true;
}
}
@@ -1846,7 +1846,7 @@ void CMoviePlayerGui::selectAudioPid()
CVolume::getInstance()->SetCurrentPid(currentapid);
for (uint i=0; i < numpida; i++) {
percent[i] = CZapit::getInstance()->GetPidVolume(p_movie_info->epgId, apids[i], ac3flags[i]);
APIDSelector.addItem(new CMenuOptionNumberChooser(p_movie_info->audioPids[i].epgAudioPidName,
APIDSelector.addItem(new CMenuOptionNumberChooser(p_movie_info->audioPids[i].AudioPidName,
&percent[i], currentapid == apids[i],
0, 999, CVolume::getInstance()));
}