simplified translation strings

[ncmpc.git] / src / screen_file.c

diff --git a/src/screen_file.c b/src/screen_file.c
index aabac7afa9cc1da019dd3124f27a4eea74e6c574..d104341679d26093b7cdc4b1c69da9d64cc1e92d 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
@@ -26,7 +26,6 @@
 #include "screen_utils.h"
 #include "screen_browser.h"
 #include "screen_play.h"
-#include "gcc.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -54,8 +53,8 @@ file_repaint_if_active(void)
 
 /* the db have changed -> update the filelist */
 static void
-file_changed_callback(mpdclient_t *c, mpd_unused int event,
-                     mpd_unused gpointer data)
+file_changed_callback(mpdclient_t *c, G_GNUC_UNUSED int event,
+                     G_GNUC_UNUSED gpointer data)
 {
        browser.filelist = mpdclient_filelist_update(c, browser.filelist);
 #ifndef NCMPC_MINI
@@ -122,7 +121,7 @@ handle_delete(mpdclient_t *c)
        entity = entry->entity;
 
        if( entity->type!=MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) {
-               screen_status_printf(_("You can only delete playlists!"));
+               screen_status_printf(_("Deleting this item is not possible"));
                screen_bell();
                return -1;
        }
@@ -134,14 +133,14 @@ handle_delete(mpdclient_t *c)
        key = tolower(screen_getch(screen.status_window.w, buf));
        g_free(buf);
        if( key != YES[0] ) {
-               screen_status_printf(_("Aborted!"));
+               screen_status_printf(_("Aborted"));
                return 0;
        }
 
        if( mpdclient_cmd_delete_playlist(c, plf->path) )
                return -1;
 
-       screen_status_printf(_("Playlist deleted!"));
+       screen_status_printf(_("Playlist deleted"));
        return 0;
 }
 
@@ -167,7 +166,7 @@ browse_exit(void)
 }
 
 static void
-browse_open(mpd_unused mpdclient_t *c)
+browse_open(G_GNUC_UNUSED mpdclient_t *c)
 {
        if (browser.filelist == NULL) {
                browser.filelist = mpdclient_filelist_get(c, "");
@@ -195,7 +194,9 @@ browse_title(char *str, size_t size)
                path = browser.filelist->path;
 
        path_locale = utf8_to_locale(path);
-       g_snprintf(str, size, _("Browse: %s"), path_locale);
+       g_snprintf(str, size, "%s: %s",
+                  /* translators: caption of the browser screen */
+                  _("Browse"), path_locale);
        g_free(path_locale);
        return str;
 }
@@ -206,18 +207,24 @@ browse_paint(void)
        list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
 }
 
-static int
+static bool
 browse_cmd(mpdclient_t *c, command_t cmd)
 {
        switch(cmd) {
        case CMD_GO_ROOT_DIRECTORY:
                browser_change_directory(&browser, c, NULL, "");
                file_repaint();
-               return 1;
+               return true;
        case CMD_GO_PARENT_DIRECTORY:
                browser_change_directory(&browser, c, NULL, "..");
                file_repaint();
-               return 1;
+               return true;
+
+       case CMD_LOCATE:
+               /* don't let browser_cmd() evaluate the locate command
+                  - it's a no-op, and by the way, leads to a
+                  segmentation fault in the current implementation */
+               return false;
 
        case CMD_DELETE:
                handle_delete(c);
@@ -234,24 +241,22 @@ browse_cmd(mpdclient_t *c, command_t cmd)
                list_window_check_selected(browser.lw,
                                           filelist_length(browser.filelist));
                file_repaint();
-
-               screen_status_printf(_("Screen updated!"));
-               return 0;
+               return false;
 
        case CMD_DB_UPDATE:
                if (c->status == NULL)
-                       return 1;
+                       return true;
 
                if (!c->status->updatingDb) {
                        if (mpdclient_cmd_db_update(c, browser.filelist->path) == 0) {
                                if (strcmp(browser.filelist->path, "")) {
                                        char *path_locale =
                                                utf8_to_locale(browser.filelist->path);
-                                       screen_status_printf(_("Database update of %s started!"),
+                                       screen_status_printf(_("Database update of %s started"),
                                                             path_locale);
                                        g_free(path_locale);
                                } else
-                                       screen_status_printf(_("Database update started!"));
+                                       screen_status_printf(_("Database update started"));
 
                                /* set updatingDb to make shure the browse callback gets called
                                 * even if the updated has finished before status is updated */
@@ -259,7 +264,7 @@ browse_cmd(mpdclient_t *c, command_t cmd)
                        }
                } else
                        screen_status_printf(_("Database update running..."));
-               return 1;
+               return true;
 
        default:
                break;
@@ -268,10 +273,10 @@ browse_cmd(mpdclient_t *c, command_t cmd)
        if (browser_cmd(&browser, c, cmd)) {
                if (screen_is_visible(&screen_browse))
                        file_repaint();
-               return 1;
+               return true;
        }
 
-       return 0;
+       return false;
 }
 
 const struct screen_functions screen_browse = {
@@ -283,3 +288,44 @@ const struct screen_functions screen_browse = {
        .cmd = browse_cmd,
        .get_title = browse_title,
 };
+
+bool
+screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song)
+{
+       const char *slash, *parent;
+       char *allocated = NULL;
+       bool ret;
+       int i;
+
+       assert(song != NULL);
+       assert(song->file != NULL);
+
+       if (strstr(song->file, "//") != NULL)
+               /* an URL? */
+               return false;
+
+       /* determine the song's parent directory and go there */
+
+       slash = strrchr(song->file, '/');
+       if (slash != NULL)
+               parent = allocated = g_strndup(song->file, slash - song->file);
+       else
+               parent = "";
+
+       ret = browser_change_directory(&browser, c, NULL, parent);
+       g_free(allocated);
+       if (!ret)
+               return false;
+
+       /* select the specified song */
+
+       i = filelist_find_song(browser.filelist, song);
+       if (i < 0)
+               i = 0;
+
+       list_window_set_selected(browser.lw, i);
+
+       /* finally, switch to the file screen */
+       screen_switch(&screen_browse, c);
+       return true;
+}