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

fixes for 64bit archs: don't assume a pointer is 32bit wide

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d806eeb544
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-06 (Sat, 06 Oct 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-10-06 17:49:16 +02:00
parent d26c759aa9
commit 485656f13a
15 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/file.h
View File

@@ -33,12 +33,16 @@
#ifndef __FILE_H__
#define __FILE_H__
#include <config.h>
#if 0
/* this is already done by AC_SYS_LARGEFILE */
#include <features.h> /* make sure off_t has size 8
in __USE_FILE_OFFSET64 mode */
#ifndef __USE_FILE_OFFSET64
#error not using 64 bit file offsets
#endif /* __USE_FILE__OFFSET64 */
#endif
#include <sys/types.h>

3
src/driver/radiotools.h
View File

@@ -24,13 +24,12 @@
#ifndef __RADIO_TOOLS_H
#define __RADIO_TOOLS_H
#include <stdint.h>
unsigned short crc16_ccitt(unsigned char *daten, int len, bool skipfirst);
char *rtrim(char *text);
typedef long long unsigned int uint64_t;
class cTimeMs {
private:
uint64_t begin;

20
src/driver/rcinput.cpp
View File

@@ -839,17 +839,17 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
break;
case NeutrinoMessages::EVT_POPUP :
*msg = NeutrinoMessages::EVT_POPUP;
*data = (unsigned) p;
*data = (unsigned long) p;
dont_delete_p = true;
break;
case NeutrinoMessages::EVT_EXTMSG :
*msg = NeutrinoMessages::EVT_EXTMSG;
*data = (unsigned) p;
*data = (unsigned long) p;
dont_delete_p = true;
break;
case NeutrinoMessages::CHANGEMODE : // Change
*msg = NeutrinoMessages::CHANGEMODE;
*data = *(unsigned*) p;
*data = *(unsigned long*) p;
break;
case NeutrinoMessages::STANDBY_TOGGLE :
*msg = NeutrinoMessages::STANDBY_TOGGLE;
@@ -865,7 +865,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
break;
case NeutrinoMessages::EVT_START_PLUGIN :
*msg = NeutrinoMessages::EVT_START_PLUGIN;
*data = (unsigned) p;
*data = (unsigned long) p;
dont_delete_p = true;
break;
case NeutrinoMessages::LOCK_RC :
@@ -1107,7 +1107,7 @@ printf("[neutrino] CSectionsdClient::EVT_GOT_CN_EPG\n");
{
case CTimerdClient::EVT_ANNOUNCE_RECORD :
*msg = NeutrinoMessages::ANNOUNCE_RECORD;
*data = (unsigned) p;
*data = (unsigned long) p;
dont_delete_p = true;
break;
case CTimerdClient::EVT_ANNOUNCE_ZAPTO :
@@ -1128,17 +1128,17 @@ printf("[neutrino] CSectionsdClient::EVT_GOT_CN_EPG\n");
break;
case CTimerdClient::EVT_RECORD_START :
*msg = NeutrinoMessages::RECORD_START;
*data = (unsigned) p;
*data = (unsigned long) p;
dont_delete_p = true;
break;
case CTimerdClient::EVT_RECORD_STOP :
*msg = NeutrinoMessages::RECORD_STOP;
*data = (unsigned) p;
*data = (unsigned long) p;
dont_delete_p = true;
break;
case CTimerdClient::EVT_ZAPTO :
*msg = NeutrinoMessages::ZAPTO;
*data = (unsigned) p;
*data = (unsigned long) p;
dont_delete_p = true;
break;
case CTimerdClient::EVT_SHUTDOWN :
@@ -1155,12 +1155,12 @@ printf("[neutrino] CSectionsdClient::EVT_GOT_CN_EPG\n");
break;
case CTimerdClient::EVT_REMIND :
*msg = NeutrinoMessages::REMIND;
*data = (unsigned) p;
*data = (unsigned long) p;
dont_delete_p = true;
break;
case CTimerdClient::EVT_EXEC_PLUGIN :
*msg = NeutrinoMessages::EVT_START_PLUGIN;
*data = (unsigned) p;
*data = (unsigned long) p;
dont_delete_p = true;
break;

4
src/driver/rcinput.h
View File

@@ -108,8 +108,8 @@
*/
typedef uint32_t neutrino_msg_t;
typedef uint32_t neutrino_msg_data_t;
typedef unsigned long neutrino_msg_t;
typedef unsigned long neutrino_msg_data_t;
#define NEUTRINO_UDS_NAME "/tmp/neutrino.sock"

6
src/driver/streamts.cpp
View File

@@ -225,7 +225,7 @@ void streamts_main_thread(void * /*data*/)
pfd[tcnt].revents = 0;
tcnt++;
exit_flag = 0;
pthread_create (&st, NULL, streamts_live_thread, (void *) connfd);
pthread_create (&st, NULL, streamts_live_thread, &connfd);
} else {
if (pfd[i].revents & (POLLHUP | POLLRDHUP)) {
connfd = -1;
@@ -259,7 +259,7 @@ void * streamts_live_thread(void *data)
int pids[MAXPIDS];
char cbuf[512];
char *bp;
int fd = (int) data;
int fd = *((int *)data);
FILE * fp;
unsigned char demuxfd_count = 0;
@@ -370,7 +370,7 @@ void streamts_file_thread(void *data)
int tsfilelen = 0;
int fileslice = 0;
int i = 0;
int fd = (int) data;
int fd = *((int *)data);
buf = (unsigned char *) malloc(IN_SIZE);