chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from Disobedience branch
[disorder]
/
disobedience
/
queue.c
diff --git
a/disobedience/queue.c
b/disobedience/queue.c
index f298b1f71b0b9f0a816e17c87f6955125788dbf8..d69b34dd3e444218af2ce0936c8b9b6b9886fe26 100644
(file)
--- a/
disobedience/queue.c
+++ b/
disobedience/queue.c
@@
-32,10
+32,10
@@
struct queue_entry *playing_track;
time_t last_playing;
static void queue_completed(void *v,
time_t last_playing;
static void queue_completed(void *v,
- const char *err
or
,
+ const char *err,
struct queue_entry *q);
static void playing_completed(void *v,
struct queue_entry *q);
static void playing_completed(void *v,
- const char *err
or
,
+ const char *err,
struct queue_entry *q);
/** @brief Called when either the actual queue or the playing track change */
struct queue_entry *q);
/** @brief Called when either the actual queue or the playing track change */
@@
-75,10
+75,10
@@
static void queue_playing_changed(void) {
/** @brief Update the queue itself */
static void queue_completed(void attribute((unused)) *v,
/** @brief Update the queue itself */
static void queue_completed(void attribute((unused)) *v,
- const char *err
or
,
+ const char *err,
struct queue_entry *q) {
struct queue_entry *q) {
- if(err
or
) {
- popup_protocol_error(0, err
or
);
+ if(err) {
+ popup_protocol_error(0, err);
return;
}
actual_queue = q;
return;
}
actual_queue = q;
@@
-87,10
+87,10
@@
static void queue_completed(void attribute((unused)) *v,
/** @brief Update the playing track */
static void playing_completed(void attribute((unused)) *v,
/** @brief Update the playing track */
static void playing_completed(void attribute((unused)) *v,
- const char *err
or
,
+ const char *err,
struct queue_entry *q) {
struct queue_entry *q) {
- if(err
or
) {
- popup_protocol_error(0, err
or
);
+ if(err) {
+ popup_protocol_error(0, err);
return;
}
actual_playing_track = q;
return;
}
actual_playing_track = q;
@@
-198,9
+198,9
@@
struct queuelike ql_queue = {
static int queue_drag_target = -1;
static void queue_move_completed(void attribute((unused)) *v,
static int queue_drag_target = -1;
static void queue_move_completed(void attribute((unused)) *v,
- const char *err
or
) {
- if(err
or
) {
- popup_protocol_error(0, err
or
);
+ const char *err) {
+ if(err) {
+ popup_protocol_error(0, err);
return;
}
/* The log should tell us the queue changed so we do no more here */
return;
}
/* The log should tell us the queue changed so we do no more here */