mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-27 23:42:58 +02:00
change 'long long' tom int64_t'
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@293 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -142,7 +142,7 @@ int CStreamInfo2::doSignalStrengthLoop ()
|
||||
lastsnr = lastsig = -1;
|
||||
|
||||
neutrino_msg_t msg;
|
||||
unsigned long long maxb, minb, lastb, tmp_rate;
|
||||
uint64_t maxb, minb, lastb, tmp_rate;
|
||||
int cnt = 0,i=0;
|
||||
uint16_t ssig, ssnr;
|
||||
uint32_t ber;
|
||||
@@ -156,7 +156,7 @@ int CStreamInfo2::doSignalStrengthLoop ()
|
||||
while (1) {
|
||||
neutrino_msg_data_t data;
|
||||
|
||||
unsigned long long timeoutEnd = CRCInput::calcTimeoutEnd_MS (100);
|
||||
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_MS (100);
|
||||
g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd);
|
||||
|
||||
ssig = frontend->getSignalStrength();
|
||||
@@ -696,7 +696,7 @@ long delta_time_ms (struct timeval *tv, struct timeval *last_tv)
|
||||
return timeval_to_ms (tv) - timeval_to_ms (last_tv);
|
||||
}
|
||||
|
||||
unsigned long long b_total;
|
||||
uint64_t b_total;
|
||||
static cDemux * dmx;
|
||||
|
||||
int CStreamInfo2::ts_setup ()
|
||||
@@ -749,15 +749,15 @@ int CStreamInfo2::update_rate ()
|
||||
if (d_tim_ms <= 0)
|
||||
d_tim_ms = 1; // ignore usecs
|
||||
|
||||
bit_s = (((unsigned long long) b * 8000ULL) + ((unsigned long long) d_tim_ms / 2ULL))
|
||||
/ (unsigned long long) d_tim_ms;
|
||||
bit_s = (((uint64_t) b * 8000ULL) + ((uint64_t) d_tim_ms / 2ULL))
|
||||
/ (uint64_t) d_tim_ms;
|
||||
|
||||
d_tim_ms = delta_time_ms (&tv, &first_tv);
|
||||
if (d_tim_ms <= 0)
|
||||
d_tim_ms = 1; // ignore usecs
|
||||
|
||||
abit_s = ((b_total * 8000ULL) + ((unsigned long long) d_tim_ms / 2ULL))
|
||||
/ (unsigned long long) d_tim_ms;
|
||||
abit_s = ((b_total * 8000ULL) + ((uint64_t) d_tim_ms / 2ULL))
|
||||
/ (uint64_t) d_tim_ms;
|
||||
|
||||
last_tv.tv_sec = tv.tv_sec;
|
||||
last_tv.tv_usec = tv.tv_usec;
|
||||
|
Reference in New Issue
Block a user