projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
audiod: Fix status item parsing for long status items.
[paraslash.git]
/
audiod_command.c
diff --git
a/audiod_command.c
b/audiod_command.c
index bb916713254d96829a953a84121b0a3daeb992ba..8024ec56b853ac5f4b81661e074a4a4a5f72d1dd 100644
(file)
--- a/
audiod_command.c
+++ b/
audiod_command.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005-20
09
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-20
10
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-9,12
+9,14
@@
#include <regex.h>
#include <sys/types.h>
#include <dirent.h>
#include <regex.h>
#include <sys/types.h>
#include <dirent.h>
+#include <stdbool.h>
#include "para.h"
#include "audiod.cmdline.h"
#include "list.h"
#include "sched.h"
#include "ggo.h"
#include "para.h"
#include "audiod.cmdline.h"
#include "list.h"
#include "sched.h"
#include "ggo.h"
+#include "buffer_tree.h"
#include "filter.h"
#include "grab_client.h"
#include "error.h"
#include "filter.h"
#include "grab_client.h"
#include "error.h"
@@
-22,6
+24,7
@@
#include "net.h"
#include "daemon.h"
#include "string.h"
#include "net.h"
#include "daemon.h"
#include "string.h"
+#include "write.h"
#include "fd.h"
#include "audiod_command_list.h"
#include "fd.h"
#include "audiod_command_list.h"
@@
-190,18
+193,22
@@
__malloc static char *audiod_status_string(void)
static int get_play_time_slot_num(void)
{
static int get_play_time_slot_num(void)
{
- int i, oldest = -1;
+ int i, oldest_slot = -1;
+ struct timeval oldest_wstime = {0, 0};
FOR_EACH_SLOT(i) {
struct slot_info *s = &slot[i];
FOR_EACH_SLOT(i) {
struct slot_info *s = &slot[i];
- if (!s->wng)
+ struct timeval wstime;
+ if (!s->wns)
continue;
continue;
- if (oldest >= 0 && tv_diff(&s->wstime, &slot[oldest].wstime,
-
NULL) > 0)
+ btr_get_node_start(s->wns[0].btrn, &wstime);
+
if (oldest_slot >= 0 && tv_diff(&wstime, &oldest_wstime,
NULL) > 0)
continue;
continue;
- oldest = i;
+ oldest_wstime = wstime;
+ oldest_slot = i;
}
}
- return oldest;
+ //PARA_CRIT_LOG("oldest slot: %d\n", oldest_slot);
+ return oldest_slot;
}
__malloc static char *decoder_flags(void)
}
__malloc static char *decoder_flags(void)
@@
-214,9
+221,9
@@
__malloc static char *decoder_flags(void)
char flag = '0';
if (s->receiver_node)
flag += 1;
char flag = '0';
if (s->receiver_node)
flag += 1;
- if (s->f
c
)
+ if (s->f
ns
)
flag += 2;
flag += 2;
- if (s->wn
g
)
+ if (s->wn
s
)
flag += 4;
flags[i] = flag;
}
flag += 4;
flags[i] = flag;
}