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

movieinfo: internally rename epgAudioPid -> AudioPid

Browse Source 
Origin commit data
------------------
Commit: 6fe2d04e1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid
This commit is contained in:
vanhofen
2016-09-09 18:58:11 +02:00
parent ce05cd6d81
commit d0882070ed
5 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/driver/record.cpp
View File

@@ -178,11 +178,11 @@ record_error_msg_t CRecordInstance::Start(CZapitChannel * channel)
} }
} }
for (unsigned int i = 0; i < recMovieInfo->audioPids.size(); i++) { for (unsigned int i = 0; i < recMovieInfo->audioPids.size(); i++) {
apids[numpids++] = recMovieInfo->audioPids[i].epgAudioPid; apids[numpids++] = recMovieInfo->audioPids[i].AudioPid;
if(channel->getAudioChannel(i)->audioChannelType == CZapitAudioChannel::EAC3){ if(channel->getAudioChannel(i)->audioChannelType == CZapitAudioChannel::EAC3){
psi.addPid(recMovieInfo->audioPids[i].epgAudioPid, EN_TYPE_AUDIO_EAC3, recMovieInfo->audioPids[i].atype, channel->getAudioChannel(i)->description.c_str()); psi.addPid(recMovieInfo->audioPids[i].AudioPid, EN_TYPE_AUDIO_EAC3, recMovieInfo->audioPids[i].atype, channel->getAudioChannel(i)->description.c_str());
}else }else
psi.addPid(recMovieInfo->audioPids[i].epgAudioPid, EN_TYPE_AUDIO, recMovieInfo->audioPids[i].atype, channel->getAudioChannel(i)->description.c_str()); psi.addPid(recMovieInfo->audioPids[i].AudioPid, EN_TYPE_AUDIO, recMovieInfo->audioPids[i].atype, channel->getAudioChannel(i)->description.c_str());
if (numpids >= REC_MAX_APIDS) if (numpids >= REC_MAX_APIDS)
break; break;
@@ -339,10 +339,10 @@ bool CRecordInstance::Update()
record->AddPid(it->apid); record->AddPid(it->apid);
for(unsigned int i = 0; i < allpids.APIDs.size(); i++) { for(unsigned int i = 0; i < allpids.APIDs.size(); i++) {
if(allpids.APIDs[i].pid == it->apid) { if(allpids.APIDs[i].pid == it->apid) {
EPG_AUDIO_PIDS audio_pids; AUDIO_PIDS audio_pids;
audio_pids.epgAudioPid = allpids.APIDs[i].pid; audio_pids.AudioPid = allpids.APIDs[i].pid;
audio_pids.epgAudioPidName = allpids.APIDs[i].desc; audio_pids.AudioPidName = allpids.APIDs[i].desc;
audio_pids.atype = allpids.APIDs[i].is_ac3 ? 1 : allpids.APIDs[i].is_aac ? 5 : allpids.APIDs[i].is_eac3 ? 7 : 0; audio_pids.atype = allpids.APIDs[i].is_ac3 ? 1 : allpids.APIDs[i].is_aac ? 5 : allpids.APIDs[i].is_eac3 ? 7 : 0;
audio_pids.selected = 0; audio_pids.selected = 0;
recMovieInfo->audioPids.push_back(audio_pids); recMovieInfo->audioPids.push_back(audio_pids);
@@ -623,15 +623,15 @@ void CRecordInstance::FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis
recMovieInfo->VideoPid = allpids.PIDs.vpid; recMovieInfo->VideoPid = allpids.PIDs.vpid;
recMovieInfo->VideoType = channel->type; recMovieInfo->VideoType = channel->type;
EPG_AUDIO_PIDS audio_pids; AUDIO_PIDS audio_pids;
APIDList::iterator it; APIDList::iterator it;
for(unsigned int i= 0; i< allpids.APIDs.size(); i++) { for(unsigned int i= 0; i< allpids.APIDs.size(); i++) {
for(it = apid_list.begin(); it != apid_list.end(); ++it) { for(it = apid_list.begin(); it != apid_list.end(); ++it) {
if(allpids.APIDs[i].pid == it->apid) { if(allpids.APIDs[i].pid == it->apid) {
audio_pids.epgAudioPid = allpids.APIDs[i].pid; audio_pids.AudioPid = allpids.APIDs[i].pid;
audio_pids.epgAudioPidName = allpids.APIDs[i].desc; audio_pids.AudioPidName = allpids.APIDs[i].desc;
audio_pids.atype = allpids.APIDs[i].is_ac3 ? 1 : allpids.APIDs[i].is_aac ? 5 : allpids.APIDs[i].is_eac3 ? 7 : 0; audio_pids.atype = allpids.APIDs[i].is_ac3 ? 1 : allpids.APIDs[i].is_aac ? 5 : allpids.APIDs[i].is_eac3 ? 7 : 0;
audio_pids.selected = (audio_pids.epgAudioPid == channel->getAudioPid()) ? 1 : 0; audio_pids.selected = (audio_pids.AudioPid == channel->getAudioPid()) ? 1 : 0;
recMovieInfo->audioPids.push_back(audio_pids); recMovieInfo->audioPids.push_back(audio_pids);
} }
} }
@@ -639,8 +639,8 @@ void CRecordInstance::FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis
/* FIXME sometimes no apid in xml ?? */ /* FIXME sometimes no apid in xml ?? */
if(recMovieInfo->audioPids.empty() && !allpids.APIDs.empty()) { if(recMovieInfo->audioPids.empty() && !allpids.APIDs.empty()) {
int i = 0; int i = 0;
audio_pids.epgAudioPid = allpids.APIDs[i].pid; audio_pids.AudioPid = allpids.APIDs[i].pid;
audio_pids.epgAudioPidName = allpids.APIDs[i].desc; audio_pids.AudioPidName = allpids.APIDs[i].desc;
audio_pids.atype = allpids.APIDs[i].is_ac3 ? 1 : allpids.APIDs[i].is_aac ? 5 : allpids.APIDs[i].is_eac3 ? 7 : 0; audio_pids.atype = allpids.APIDs[i].is_ac3 ? 1 : allpids.APIDs[i].is_aac ? 5 : allpids.APIDs[i].is_eac3 ? 7 : 0;
audio_pids.selected = 1; audio_pids.selected = 1;
recMovieInfo->audioPids.push_back(audio_pids); recMovieInfo->audioPids.push_back(audio_pids);
@@ -1979,7 +1979,7 @@ void CStreamRec::FillMovieInfo(CZapitChannel * /*channel*/, APIDList & /*apid_li
AVStream *st = ofcx->streams[i]; AVStream *st = ofcx->streams[i];
AVCodecContext * codec = st->codec; AVCodecContext * codec = st->codec;
if (codec->codec_type == AVMEDIA_TYPE_AUDIO) { if (codec->codec_type == AVMEDIA_TYPE_AUDIO) {
EPG_AUDIO_PIDS audio_pids; AUDIO_PIDS audio_pids;
AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0); AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0);
AVDictionaryEntry *title = av_dict_get(st->metadata, "title", NULL, 0); AVDictionaryEntry *title = av_dict_get(st->metadata, "title", NULL, 0);
@@ -2009,10 +2009,10 @@ void CStreamRec::FillMovieInfo(CZapitChannel * /*channel*/, APIDList & /*apid_li
} }
audio_pids.selected = 0; audio_pids.selected = 0;
audio_pids.epgAudioPidName = desc; audio_pids.AudioPidName = desc;
audio_pids.epgAudioPid = st->id; audio_pids.AudioPid = st->id;
recMovieInfo->audioPids.push_back(audio_pids); recMovieInfo->audioPids.push_back(audio_pids);
printf("%s: [AUDIO] 0x%x [%s]\n", __FUNCTION__, audio_pids.epgAudioPid, desc.c_str()); printf("%s: [AUDIO] 0x%x [%s]\n", __FUNCTION__, audio_pids.AudioPid, desc.c_str());
} else if (codec->codec_type == AVMEDIA_TYPE_VIDEO) { } else if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {
recMovieInfo->VideoPid = st->id; recMovieInfo->VideoPid = st->id;

2
src/gui/epgview.cpp
View File

@@ -634,7 +634,7 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mi, int mp_position, int mp_duration, bool
{ {
if (i) if (i)
extMovieInfo += ", "; extMovieInfo += ", ";
extMovieInfo += mp_movie_info->audioPids[i].epgAudioPidName; extMovieInfo += mp_movie_info->audioPids[i].AudioPidName;
} }
extMovieInfo += "\n"; extMovieInfo += "\n";
} }

18
src/gui/movieinfo.cpp
View File

@@ -121,13 +121,13 @@ bool CMovieInfo::encodeMovieInfoXml(std::string * extMessage, MI_MOVIE_INFO * mo
for (unsigned int i = 0; i < movie_info->audioPids.size(); i++) // pids.APIDs.size() for (unsigned int i = 0; i < movie_info->audioPids.size(); i++) // pids.APIDs.size()
{ {
*extMessage += "\t\t\t<" MI_XML_TAG_AUDIO " " MI_XML_TAG_PID "=\""; *extMessage += "\t\t\t<" MI_XML_TAG_AUDIO " " MI_XML_TAG_PID "=\"";
*extMessage += to_string(movie_info->audioPids[i].epgAudioPid); *extMessage += to_string(movie_info->audioPids[i].AudioPid);
*extMessage += "\" " MI_XML_TAG_ATYPE "=\""; *extMessage += "\" " MI_XML_TAG_ATYPE "=\"";
*extMessage += to_string(movie_info->audioPids[i].atype); *extMessage += to_string(movie_info->audioPids[i].atype);
*extMessage += "\" " MI_XML_TAG_SELECTED "=\""; *extMessage += "\" " MI_XML_TAG_SELECTED "=\"";
*extMessage += to_string(movie_info->audioPids[i].selected); *extMessage += to_string(movie_info->audioPids[i].selected);
*extMessage += "\" " MI_XML_TAG_NAME "=\""; *extMessage += "\" " MI_XML_TAG_NAME "=\"";
*extMessage += ZapitTools::UTF8_to_UTF8XML(movie_info->audioPids[i].epgAudioPidName.c_str()); *extMessage += ZapitTools::UTF8_to_UTF8XML(movie_info->audioPids[i].AudioPidName.c_str());
*extMessage += "\"/>\n"; *extMessage += "\"/>\n";
} }
*extMessage += "\t\t</" MI_XML_TAG_AUDIOPIDS ">\n"; *extMessage += "\t\t</" MI_XML_TAG_AUDIOPIDS ">\n";
@@ -287,7 +287,7 @@ bool CMovieInfo::parseXmlTree(std::string &_text, MI_MOVIE_INFO *movie_info)
int pos = 0; int pos = 0;
EPG_AUDIO_PIDS audio_pids; AUDIO_PIDS audio_pids;
while ((pos = find_next_char('<', text, pos, bytes)) != -1) { while ((pos = find_next_char('<', text, pos, bytes)) != -1) {
pos++; pos++;
@@ -334,9 +334,9 @@ bool CMovieInfo::parseXmlTree(std::string &_text, MI_MOVIE_INFO *movie_info)
while (text[pos + pos2] != '\"' && text[pos + pos2] != 0 && text[pos + pos2] != '/') while (text[pos + pos2] != '\"' && text[pos + pos2] != 0 && text[pos + pos2] != '/')
pos2++; pos2++;
if (text[pos + pos2] == '\"') if (text[pos + pos2] == '\"')
audio_pids.epgAudioPid = atoi(&text[pos + pos2 + 1]); audio_pids.AudioPid = atoi(&text[pos + pos2 + 1]);
} else } else
audio_pids.epgAudioPid = 0; audio_pids.AudioPid = 0;
audio_pids.atype = 0; audio_pids.atype = 0;
pos2 = -1; pos2 = -1;
@@ -366,7 +366,7 @@ bool CMovieInfo::parseXmlTree(std::string &_text, MI_MOVIE_INFO *movie_info)
audio_pids.selected = atoi(&text[pos + pos2 + 1]); audio_pids.selected = atoi(&text[pos + pos2 + 1]);
} }
audio_pids.epgAudioPidName = ""; audio_pids.AudioPidName = "";
//pos2 = strcspn(&text[pos],MI_XML_TAG_NAME); //pos2 = strcspn(&text[pos],MI_XML_TAG_NAME);
pos2 = -1; pos2 = -1;
ptr = strstr(&text[pos], MI_XML_TAG_NAME); ptr = strstr(&text[pos], MI_XML_TAG_NAME);
@@ -382,12 +382,12 @@ bool CMovieInfo::parseXmlTree(std::string &_text, MI_MOVIE_INFO *movie_info)
pos3++; pos3++;
if (text[pos + pos3] == '\"') if (text[pos + pos3] == '\"')
{ {
audio_pids.epgAudioPidName.append(&text[pos + pos2 + 1], pos3 - pos2 - 1); audio_pids.AudioPidName.append(&text[pos + pos2 + 1], pos3 - pos2 - 1);
audio_pids.epgAudioPidName = htmlEntityDecode(audio_pids.epgAudioPidName); audio_pids.AudioPidName = htmlEntityDecode(audio_pids.AudioPidName);
} }
} }
} }
//printf("MOVIE INFO: apid %d type %d name %s selected %d\n", audio_pids.epgAudioPid, audio_pids.atype, audio_pids.epgAudioPidName.c_str(), audio_pids.selected); //printf("MOVIE INFO: apid %d type %d name %s selected %d\n", audio_pids.AudioPid, audio_pids.atype, audio_pids.AudioPidName.c_str(), audio_pids.selected);
movie_info->audioPids.push_back(audio_pids); movie_info->audioPids.push_back(audio_pids);
} }
/* parse bookmarks */ /* parse bookmarks */

8
src/gui/movieinfo.h
View File

@@ -108,9 +108,9 @@ typedef struct
{ {
int atype; int atype;
int selected; int selected;
int epgAudioPid; // epg audio pid nr, usually filled by VCR int AudioPid; // audio pid nr, usually filled by VCR
std::string epgAudioPidName; // epg audio pid name, usually filled by VCR std::string AudioPidName; // audio pid name, usually filled by VCR
} EPG_AUDIO_PIDS; } AUDIO_PIDS;
class MI_MOVIE_INFO //MI_MOVIE_INFO &operator=(const MI_MOVIE_INFO& src); class MI_MOVIE_INFO //MI_MOVIE_INFO &operator=(const MI_MOVIE_INFO& src);
{ {
@@ -135,7 +135,7 @@ class MI_MOVIE_INFO //MI_MOVIE_INFO &operator=(const MI_MOVIE_INFO& src);
//char format; // currently not used //char format; // currently not used
//char audio; // currently not used //char audio; // currently not used
MI_MOVIE_BOOKMARKS bookmarks; // bookmark collecton for this movie MI_MOVIE_BOOKMARKS bookmarks; // bookmark collecton for this movie
std::vector<EPG_AUDIO_PIDS> audioPids; // available AudioPids, usually filled by VCR. Note: Vectors are easy to is also using the heap (memory fragmentation), might be changed to array [MI_MAX_AUDIO_PIDS] std::vector<AUDIO_PIDS> audioPids; // available AudioPids, usually filled by VCR. Note: Vectors are easy to is also using the heap (memory fragmentation), might be changed to array [MI_MAX_AUDIO_PIDS]
uint64_t epgId; // currently not used, we just do not want to loose this info if movie info is saved backed uint64_t epgId; // currently not used, we just do not want to loose this info if movie info is saved backed
uint64_t epgEpgId; // off_t currently not used, we just do not want to loose this info if movie info is saved backed uint64_t epgEpgId; // off_t currently not used, we just do not want to loose this info if movie info is saved backed

12
src/gui/movieplayer.cpp
View File

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