oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/raop: use fill_int() in fill_time_...()

Browse Source 
Eliminate duplicate code.
This commit is contained in:
Max Kellermann 2011-08-24 02:18:51 +02:00
parent bcaff4b844
commit 08b88714e0
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/output/raop_output_plugin.c
View File

@ -374,6 +374,18 @@ get_tcp_connect_by_host(int sd, const char *host, short destport,
get_tcp_connect(sd, addr, error_r);
}
/*
* Calculate the current NTP time, store it in the buffer.
*/
static void
fill_int(unsigned char *buffer, unsigned int rtp_time)
{
int iter;
for (iter = 0; iter < 4; iter++) {
buffer[iter] = (rtp_time >> ((3 - iter) * 8)) & 0xff;
}
}
/*
* Store time in the NTP format in the buffer
*/
@ -381,7 +393,6 @@ static void
fill_time_buffer_with_time(unsigned char *buffer, struct timeval *tout)
{
unsigned long secs_to_baseline = 964697997;
int iter;
double fraction;
unsigned long long_fraction;
unsigned long secs;
@ -389,12 +400,8 @@ fill_time_buffer_with_time(unsigned char *buffer, struct timeval *tout)
fraction = ((double) tout->tv_usec) / 1000000.0;
long_fraction = (unsigned long) (fraction * 256.0 * 256.0 * 256.0 * 256.0);
secs = secs_to_baseline + tout->tv_sec;
for (iter = 0; iter < 4; iter++) {
buffer[iter] = (secs >> ((3 - iter) * 8)) & 0xff;
}
for (iter = 0; iter < 4; iter++) {
buffer[4 + iter] = (long_fraction >> ((3 - iter) * 8)) & 0xff;
}
fill_int(buffer, secs);
fill_int(buffer + 4, long_fraction);
}
/*
@ -409,18 +416,6 @@ fill_time_buffer(unsigned char *buffer)
fill_time_buffer_with_time(buffer, &current_time);
}
/*
* Calculate the current NTP time, store it in the buffer.
*/
static void
fill_int(unsigned char *buffer, unsigned int rtp_time)
{
int iter;
for (iter = 0; iter < 4; iter++) {
buffer[iter] = (rtp_time >> ((3 - iter) * 8)) & 0xff;
}
}
/*
* Recv the NTP datagram from the AirTunes, send back an NTP response.
*/