get rid of most compiler warnings

Origin commit data
------------------
Branch: master
Commit: aca3da1f29
Author: martii <m4rtii@gmx.de>
Date: 2012-10-27 (Sat, 27 Oct 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2012-10-27 18:08:29 +02:00
parent f7baf5ea30
commit e6519f45fe
12 changed files with 87 additions and 3 deletions

View File

@@ -367,7 +367,9 @@ bool cDemux::sectionFilter(unsigned short pid, const unsigned char * const filte
const unsigned char * const mask, int len, int timeout,
const unsigned char * const negmask)
{
#ifndef MARTII
int length = len;
#endif
memset(&s_flt, 0, sizeof(s_flt));
_open();
@@ -375,7 +377,11 @@ bool cDemux::sectionFilter(unsigned short pid, const unsigned char * const filte
if (len > DMX_FILTER_SIZE)
{
lt_info("%s #%d: len too long: %d, DMX_FILTER_SIZE %d\n", __func__, num, len, DMX_FILTER_SIZE);
#ifdef MARTII
len = DMX_FILTER_SIZE;
#else
length = DMX_FILTER_SIZE;
#endif
}
s_flt.pid = pid;
s_flt.timeout = timeout;
@@ -547,9 +553,13 @@ void *cDemux::getChannel()
bool cDemux::addPid(unsigned short Pid)
{
lt_debug("%s: pid 0x%04hx\n", __func__, Pid);
#ifndef MARTII
pes_pids pfd;
#endif
int ret;
#ifndef MARTII
struct dmx_pes_filter_params p;
#endif
if (dmx_type != DMX_TP_CHANNEL)
{
lt_info("%s pes_type %s not implemented yet! pid=%hx\n", __FUNCTION__, DMX_T[dmx_type], Pid);

View File

@@ -532,7 +532,11 @@ void cPlayback::FindAllDvbsubtitlePids(uint16_t *pids, uint16_t *numpids, std::s
#endif
//
#ifdef MARTII
cPlayback::cPlayback(int num __attribute__((unused)))
#else
cPlayback::cPlayback(int num)
#endif
{
printf("%s:%s\n", FILENAME, __FUNCTION__);
playing=false;

View File

@@ -26,6 +26,7 @@ unsigned long cCpuFreqManager::GetCpuFreq(void) {
fclose(pll0);
return 1000 * 1000 * (unsigned long) freq;
}
return 0;
}
#else
unsigned long cCpuFreqManager::GetCpuFreq(void) { lt_debug("%s\n", __FUNCTION__); return 0; }
@@ -53,7 +54,7 @@ bool cCpuFreqManager::SetCpuFreq(unsigned long f)
FILE *pll0 = fopen ("/proc/cpu_frequ/pll0_ndiv_mdiv", "w");
if (pll0) {
f /= 1000000;
fprintf(pll0, "%d\n", f/10 * 256 + 3);
fprintf(pll0, "%lu\n", f/10 * 256 + 3);
fclose (pll0);
return 0;
}

View File

@@ -499,7 +499,9 @@ int cVideo::getBlank(void)
size_t n = 0;
ssize_t r;
char *line = NULL;
#ifndef MARTII
char *p;
#endif
/* hack: the "mailbox" irq is not increasing if
* no audio or video is decoded... */
FILE *f = fopen("/proc/interrupts", "r");