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

use only allpids.APIDs in record.cpp & fix compil in netfile.cpp

Browse Source
This commit is contained in:
satbaby
2012-08-01 20:02:34 +02:00
parent 062fb5d568
commit 9d8fb59184
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/netfile.cpp
View File

@@ -1101,7 +1101,7 @@ FILE *f_open(const char *filename, const char *acctype)
/* magic, if there is any */ /* magic, if there is any */
for (int i = 0; i < known_magic_count; i++) for (int i = 0; i < known_magic_count; i++)
{ {
if (((*(uint32_t *)&(magic[0])) & *(uint32_t *)&(known_magic[i].mask[0])) == *(uint32_t *)&(known_magic[i].mode[0])) if (((*(unsigned char *)&(magic[0])) & *(unsigned char *)&(known_magic[i].mask[0])) == *(unsigned char *)&(known_magic[i].mode[0]))
{ {
f_type(fd, known_magic[i].type); f_type(fd, known_magic[i].type);
goto magic_found; goto magic_found;

6
src/driver/record.cpp
View File

@@ -295,7 +295,7 @@ bool CRecordInstance::Update()
EPG_AUDIO_PIDS audio_pids; EPG_AUDIO_PIDS audio_pids;
audio_pids.epgAudioPid = allpids.APIDs[i].pid; audio_pids.epgAudioPid = allpids.APIDs[i].pid;
audio_pids.epgAudioPidName = g_RemoteControl->current_PIDs.APIDs.empty() ? allpids.APIDs[i].desc : g_RemoteControl->current_PIDs.APIDs[i].desc; audio_pids.epgAudioPidName = allpids.APIDs[i].desc;
audio_pids.atype = allpids.APIDs[i].is_ac3 ? 1 : allpids.APIDs[i].is_aac ? 5 : 0; audio_pids.atype = allpids.APIDs[i].is_ac3 ? 1 : allpids.APIDs[i].is_aac ? 5 : 0;
audio_pids.selected = 0; audio_pids.selected = 0;
recMovieInfo->audioPids.push_back(audio_pids); recMovieInfo->audioPids.push_back(audio_pids);
@@ -547,7 +547,7 @@ void CRecordInstance::FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis
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.epgAudioPid = allpids.APIDs[i].pid;
audio_pids.epgAudioPidName = g_RemoteControl->current_PIDs.APIDs.empty() ? allpids.APIDs[i].desc : g_RemoteControl->current_PIDs.APIDs[i].desc; audio_pids.epgAudioPidName = allpids.APIDs[i].desc;
audio_pids.atype = allpids.APIDs[i].is_ac3 ? 1 : allpids.APIDs[i].is_aac ? 5 : 0; audio_pids.atype = allpids.APIDs[i].is_ac3 ? 1 : allpids.APIDs[i].is_aac ? 5 : 0;
audio_pids.selected = (audio_pids.epgAudioPid == channel->getAudioPid()) ? 1 : 0; audio_pids.selected = (audio_pids.epgAudioPid == channel->getAudioPid()) ? 1 : 0;
recMovieInfo->audioPids.push_back(audio_pids); recMovieInfo->audioPids.push_back(audio_pids);
@@ -558,7 +558,7 @@ void CRecordInstance::FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis
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.epgAudioPid = allpids.APIDs[i].pid;
audio_pids.epgAudioPidName = g_RemoteControl->current_PIDs.APIDs.empty() ? allpids.APIDs[i].desc : g_RemoteControl->current_PIDs.APIDs[i].desc; audio_pids.epgAudioPidName = allpids.APIDs[i].desc;
audio_pids.atype = allpids.APIDs[i].is_ac3 ? 1 : allpids.APIDs[i].is_aac ? 5 : 0; audio_pids.atype = allpids.APIDs[i].is_ac3 ? 1 : allpids.APIDs[i].is_aac ? 5 : 0;
audio_pids.selected = 1; audio_pids.selected = 1;
recMovieInfo->audioPids.push_back(audio_pids); recMovieInfo->audioPids.push_back(audio_pids);