mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix compiler warning

Browse Source 
Origin commit data
------------------
Branch: master
Commit: e05b1f5b85
Author: max_10 <max_10@gmx.de>
Date: 2014-12-04 (Thu, 04 Dec 2014)


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

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2014-12-04 15:25:12 +01:00
parent dea4a726c4
commit 9be0322787
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/ca_ci.cpp
View File

@@ -245,7 +245,7 @@ bool sendCreateTC(tSlot* slot)
return true; return true;
} }
void cCA::process_tpdu(tSlot* slot, unsigned char tpdu_tag, __u8* data, int asn_data_length, int con_id) void cCA::process_tpdu(tSlot* slot, unsigned char tpdu_tag, __u8* data, int asn_data_length, int /*con_id*/)
{ {
switch (tpdu_tag) switch (tpdu_tag)
{ {
@@ -532,7 +532,7 @@ int cCA::GetCAIDS(CaIdVector &Caids)
{ {
if ((*it)->camIsReady) if ((*it)->camIsReady)
{ {
for (int i = 0; i < (*it)->cam_caids.size(); i++) for (unsigned int i = 0; i < (*it)->cam_caids.size(); i++)
Caids.push_back((*it)->cam_caids[i]); Caids.push_back((*it)->cam_caids[i]);
} }
} }
@@ -559,7 +559,7 @@ SlotIt cCA::FindFreeSlot(ca_map_t camap, unsigned char scrambled)
printf("%s:%s\n", FILENAME, __func__); printf("%s:%s\n", FILENAME, __func__);
std::list<tSlot*>::iterator it; std::list<tSlot*>::iterator it;
ca_map_iterator_t caIt; ca_map_iterator_t caIt;
int i; unsigned int i;
for (it = slot_data.begin(); it != slot_data.end(); ++it) for (it = slot_data.begin(); it != slot_data.end(); ++it)
{ {
if ((*it)->camIsReady && (*it)->hasCAManager && (*it)->hasAppManager && !(*it)->inUse) if ((*it)->camIsReady && (*it)->hasCAManager && (*it)->hasAppManager && !(*it)->inUse)
@@ -593,7 +593,7 @@ SlotIt cCA::FindFreeSlot(ca_map_t camap, unsigned char scrambled)
} }
/* erstmal den capmt wie er von Neutrino kommt in den Slot puffern */ /* erstmal den capmt wie er von Neutrino kommt in den Slot puffern */
bool cCA::SendCAPMT(u64 tpid, u8 source_demux, u8 camask, const unsigned char * cabuf, u32 calen, const unsigned char * rawpmt, u32 rawlen, unsigned char scrambled, ca_map_t cm, int mode, bool enabled) bool cCA::SendCAPMT(u64 tpid, u8 source_demux, u8 camask, const unsigned char * cabuf, u32 calen, const unsigned char * /*rawpmt*/, u32 /*rawlen*/, unsigned char scrambled, ca_map_t cm, int mode, bool enabled)
{ {
printf("%s:%s\n", FILENAME, __func__); printf("%s:%s\n", FILENAME, __func__);
if (!num_slots) return true; /* stb's without ci-slots */ if (!num_slots) return true; /* stb's without ci-slots */
@@ -626,7 +626,7 @@ bool cCA::SendCAPMT(u64 tpid, u8 source_demux, u8 camask, const unsigned char *
(*It)->tpid = tpid; (*It)->tpid = tpid;
(*It)->source = source_demux; (*It)->source = source_demux;
(*It)->pmtlen = calen; (*It)->pmtlen = calen;
for(int i = 0; i < calen; i++) for (unsigned int i = 0; i < calen; i++)
(*It)->pmtdata[i] = cabuf[i]; (*It)->pmtdata[i] = cabuf[i];
(*It)->newCapmt = true; (*It)->newCapmt = true;
} }
@@ -642,7 +642,7 @@ bool cCA::SendCAPMT(u64 tpid, u8 source_demux, u8 camask, const unsigned char *
if (!cm.empty()) if (!cm.empty())
{ {
printf("Service Caids: "); printf("Service Caids: ");
for(ca_map_iterator_t it = cm.begin(); it != cm.end(); ++it) for (ca_map_iterator_t it = cm.begin(); it != cm.end(); ++it)
{ {
printf("%04x ", (*it)); printf("%04x ", (*it));
} }
@@ -702,7 +702,7 @@ cCA::cCA(int Slots)
slot_data.push_back(slot); slot_data.push_back(slot);
/* now reset the slot so the poll pri can happen in the thread */ /* now reset the slot so the poll pri can happen in the thread */
if (ioctl(fd, CA_RESET, i) < 0) if (ioctl(fd, CA_RESET, i) < 0)
printf("IOCTL CA_RESET failed for slot %d\n", slot); printf("IOCTL CA_RESET failed for slot %p\n", slot);
/* create a thread for each slot */ /* create a thread for each slot */
if (fd > 0) if (fd > 0)
{ {
@@ -744,9 +744,9 @@ void cCA::setSource(tSlot* slot)
snprintf(buf, 64, "/proc/stb/tsmux/ci%d_input", slot->slot); snprintf(buf, 64, "/proc/stb/tsmux/ci%d_input", slot->slot);
FILE *ci = fopen(buf, "wb"); FILE *ci = fopen(buf, "wb");
if(ci > 0) if (ci > (void*)0)
{ {
switch(slot->source) switch (slot->source)
{ {
case TUNER_A: case TUNER_A:
fprintf(ci, "A"); fprintf(ci, "A");
@@ -1005,7 +1005,7 @@ void cCA::slot_pollthread(void *c)
slot->cam_caids = slot->camgrSession->getCAIDs(); slot->cam_caids = slot->camgrSession->getCAIDs();
printf("Anzahl Caids: %d Slot: %d > ", slot->cam_caids.size(), slot->slot); printf("Anzahl Caids: %d Slot: %d > ", slot->cam_caids.size(), slot->slot);
for (int i = 0; i < slot->cam_caids.size(); i++) for (unsigned int i = 0; i < slot->cam_caids.size(); i++)
{ {
printf("%04x ", slot->cam_caids[i]); printf("%04x ", slot->cam_caids[i]);
@@ -1046,7 +1046,7 @@ bool cCA::SendCaPMT(tSlot* slot)
{ {
#if x_debug #if x_debug
printf("buffered capmt(0x%X): > \n", slot->pmtlen); printf("buffered capmt(0x%X): > \n", slot->pmtlen);
for(int i = 0; i < slot->pmtlen; i++) for (unsigned int i = 0; i < slot->pmtlen; i++)
printf("%02X ", slot->pmtdata[i]); printf("%02X ", slot->pmtdata[i]);
printf("\n"); printf("\n");
#endif #endif

2
common/ca_ci.h
View File

@@ -160,7 +160,7 @@ class eDVBCICAManagerSession;
typedef struct typedef struct
{ {
pthread_t slot_thread; pthread_t slot_thread;
int slot; unsigned int slot;
int fd; int fd;
int connection_id; int connection_id;
eStatus status; eStatus status;

4
libeplayer3/input.cpp
View File

@@ -394,7 +394,9 @@ bool Input::Init(const char *filename)
subtitleTrack = NULL; subtitleTrack = NULL;
teletextTrack = NULL; teletextTrack = NULL;
#if 0
again: again:
#endif
avfc = avformat_alloc_context(); avfc = avformat_alloc_context();
avfc->interrupt_callback.callback = interrupt_cb; avfc->interrupt_callback.callback = interrupt_cb;
avfc->interrupt_callback.opaque = (void *) player; avfc->interrupt_callback.opaque = (void *) player;
@@ -418,7 +420,7 @@ again:
avfc->probesize = 131072; avfc->probesize = 131072;
} }
for (int i = 0; i < avfc->nb_streams; i++) { for (unsigned int i = 0; i < avfc->nb_streams; i++) {
if (avfc->streams[i]->codec->codec_id == AV_CODEC_ID_AAC) if (avfc->streams[i]->codec->codec_id == AV_CODEC_ID_AAC)
find_info = false; find_info = false;
} }

2
libspark/playback_libeplayer3.cpp
View File

@@ -338,7 +338,7 @@ void cPlayback::FindAllSubs(uint16_t * /*pids*/, unsigned short * /*supp*/, uint
*num = 0; *num = 0;
} }
bool cPlayback::SelectSubtitles(int pid) bool cPlayback::SelectSubtitles(int /*pid*/)
{ {
return false; return false;
} }