void (*fill)(struct choosenode *));
static void fill_root_node(struct choosenode *cn);
static void fill_directory_node(struct choosenode *cn);
-static void got_files(void *v, int nvec, char **vec);
-static void got_resolved_file(void *v, const char *track);
-static void got_dirs(void *v, int nvec, char **vec);
+static void got_files(void *v, const char *error, int nvec, char **vec);
+static void got_resolved_file(void *v, const char *error, const char *track);
+static void got_dirs(void *v, const char *error, int nvec, char **vec);
static void expand_node(struct choosenode *cn, int contingent);
static void contract_node(struct choosenode *cn);
/** @brief Fill the root */
static void fill_root_node(struct choosenode *cn) {
- struct callbackdata *cbd;
-
D(("fill_root_node"));
clear_children(cn);
/* More de-duping possible here */
if(cn->flags & CN_GETTING_ANY)
return;
gtk_label_set_text(GTK_LABEL(report_label), "getting files");
- cbd = xmalloc(sizeof *cbd);
- cbd->u.choosenode = cn;
- disorder_eclient_dirs(client, got_dirs, "", 0, cbd);
- cbd = xmalloc(sizeof *cbd);
- cbd->u.choosenode = cn;
- disorder_eclient_files(client, got_files, "", 0, cbd);
+ disorder_eclient_dirs(client, got_dirs, "", 0, cn);
+ disorder_eclient_files(client, got_files, "", 0, cn);
cn->flags |= CN_GETTING_FILES|CN_GETTING_DIRS;
gets_in_flight += 2;
}
}
/** @brief Called with a list of files just below some node */
-static void got_files(void *v, int nvec, char **vec) {
- struct callbackdata *cbd = v;
- struct choosenode *cn = cbd->u.choosenode;
+static void got_files(void *v, const char *error, int nvec, char **vec) {
+ struct choosenode *cn = v;
int n;
+ if(error) {
+ popup_protocol_error(0, error);
+ return;
+ }
+
D(("got_files %d files for %s %s", nvec, cn->path, cnflags(cn)));
- /* Complicated by the need to resolve aliases. We can save a bit of effort
- * by re-using cbd though. */
+ /* Complicated by the need to resolve aliases. */
cn->flags &= ~CN_GETTING_FILES;
--gets_in_flight;
if((cn->pending = nvec)) {
cn->flags |= CN_RESOLVING_FILES;
for(n = 0; n < nvec; ++n) {
- disorder_eclient_resolve(client, got_resolved_file, vec[n], cbd);
+ disorder_eclient_resolve(client, got_resolved_file, vec[n], cn);
++gets_in_flight;
}
}
}
/** @brief Called with an alias resolved filename */
-static void got_resolved_file(void *v, const char *track) {
- struct callbackdata *cbd = v;
- struct choosenode *cn = cbd->u.choosenode, *file_cn;
-
- D(("resolved %s %s %d left", cn->path, cnflags(cn), cn->pending - 1));
- /* TODO as below */
- file_cn = newnode(cn, track,
- trackname_transform("track", track, "display"),
- trackname_transform("track", track, "sort"),
- 0/*flags*/, 0/*fill*/);
- --gets_in_flight;
- /* Only bother updating when we've got the lot */
- if(--cn->pending == 0) {
- cn->flags &= ~CN_RESOLVING_FILES;
- updated_node(cn, gets_in_flight == 0, "got_resolved_file");
- if(!(cn->flags & CN_GETTING_ANY))
- filled(cn);
+static void got_resolved_file(void *v, const char *error, const char *track) {
+ struct choosenode *const cn = v, *file_cn;
+
+ if(error) {
+ popup_protocol_error(0, error);
+ } else {
+ D(("resolved %s %s %d left", cn->path, cnflags(cn), cn->pending - 1));
+ /* TODO as below */
+ file_cn = newnode(cn, track,
+ trackname_transform("track", track, "display"),
+ trackname_transform("track", track, "sort"),
+ 0/*flags*/, 0/*fill*/);
+ --gets_in_flight;
+ /* Only bother updating when we've got the lot */
+ if(--cn->pending == 0) {
+ cn->flags &= ~CN_RESOLVING_FILES;
+ updated_node(cn, gets_in_flight == 0, "got_resolved_file");
+ if(!(cn->flags & CN_GETTING_ANY))
+ filled(cn);
+ }
}
}
/** @brief Called with a list of directories just below some node */
-static void got_dirs(void *v, int nvec, char **vec) {
- struct callbackdata *cbd = v;
- struct choosenode *cn = cbd->u.choosenode;
+static void got_dirs(void *v, const char *error, int nvec, char **vec) {
+ struct choosenode *cn = v;
int n;
+
+ if(error) {
+ popup_protocol_error(0, error);
+ return;
+ }
D(("got_dirs %d dirs for %s %s", nvec, cn->path, cnflags(cn)));
/* TODO this depends on local configuration for trackname_transform().
* and also from initiate_seatch with an always empty list to indicate that
* we're not searching for anything in particular. */
static void search_completed(void attribute((unused)) *v,
+ const char *error,
int nvec, char **vec) {
int n;
char *s;
+ if(error) {
+ popup_protocol_error(0, error);
+ return;
+ }
+
search_in_flight = 0;
/* Contract any choosenodes that were only expanded to show search
* results */
/* The search terms are bad! We treat this as if there were no search
* terms at all. Some kind of feedback would be handy. */
fprintf(stderr, "bad terms [%s]\n", terms); /* TODO */
- search_completed(0, 0, 0);
+ search_completed(0, 0, 0, 0);
} else {
search_in_flight = 1;
}
} else {
/* No search terms - we want to see all tracks */
- search_completed(0, 0, 0);
+ search_completed(0, 0, 0, 0);
}
}
/* User actions ------------------------------------------------------------ */
+/** @brief Called when disorder_eclient_play completes */
+void play_completed(void attribute((unused)) *v,
+ const char *error) {
+ if(error)
+ popup_protocol_error(0, error);
+}
+
/** @brief Clicked on something
*
* This implements playing, all the modifiers for selection, etc.
clear_selection(root);
set_selection(cn, 1);
gtk_label_set_text(GTK_LABEL(report_label), "adding track to queue");
- disorder_eclient_play(client, cn->path, 0, 0);
+ disorder_eclient_play(client, cn->path, play_completed, 0);
last_click = 0;
}
} else if(event->type == GDK_BUTTON_PRESS
gtk_label_set_text(GTK_LABEL(report_label), "adding track to queue");
for(n = 0; tracks[n]; ++n)
- disorder_eclient_play(client, tracks[n], 0, 0);
+ disorder_eclient_play(client, tracks[n], play_completed, 0);
}
/** @brief Called when the menu's properties option is activated */
gtk_label_set_text(GTK_LABEL(report_label), "adding track to queue");
for(n = 0; n < ntracks; ++n)
- disorder_eclient_play(client, tracks[n], 0, 0);
+ disorder_eclient_play(client, tracks[n], play_completed, 0);
}
static void properties_dir(struct choosenode *cn,
/* Create the popup menus */
NW(menu);
track_menu = gtk_menu_new();
- gtk_widget_set_style(track_menu, tool_style);
g_signal_connect(track_menu, "destroy", G_CALLBACK(gtk_widget_destroyed),
&track_menu);
for(n = 0; track_menuitems[n].name; ++n) {
NW(menu_item);
track_menuitems[n].w =
gtk_menu_item_new_with_label(track_menuitems[n].name);
- gtk_widget_set_style(track_menuitems[n].w, tool_style);
gtk_menu_attach(GTK_MENU(track_menu), track_menuitems[n].w,
0, 1, n, n + 1);
}
NW(menu);
dir_menu = gtk_menu_new();
- gtk_widget_set_style(dir_menu, tool_style);
g_signal_connect(dir_menu, "destroy", G_CALLBACK(gtk_widget_destroyed),
&dir_menu);
for(n = 0; dir_menuitems[n].name; ++n) {
NW(menu_item);
dir_menuitems[n].w =
gtk_menu_item_new_with_label(dir_menuitems[n].name);
- gtk_widget_set_style(dir_menuitems[n].w, tool_style);
gtk_menu_attach(GTK_MENU(dir_menu), dir_menuitems[n].w,
0, 1, n, n + 1);
}
~mdw / disorder / blobdiff