diff options
| author | Andreas Obergrusberger <tradiaz@yahoo.de> | 2006-10-05 18:19:46 +0000 |
|---|---|---|
| committer | Andreas Obergrusberger <tradiaz@yahoo.de> | 2006-10-05 18:19:46 +0000 |
| commit | bff18fcc0031584a43b271eba7bd6d538a1028c9 (patch) | |
| tree | c61a47253e42f93f11669b44e2a9d7a53b042921 | |
| parent | 2373f8189ff927dd472f3fd0bf2741ac631a3440 (diff) | |
| download | mpd-bff18fcc0031584a43b271eba7bd6d538a1028c9.tar.gz mpd-bff18fcc0031584a43b271eba7bd6d538a1028c9.tar.xz mpd-bff18fcc0031584a43b271eba7bd6d538a1028c9.zip | |
you can specify %shortalbum% for playlist song markup, parent directory is shown in the browse screen title
git-svn-id: https://svn.musicpd.org/ncmpc/branches/tradiaz@4871 09075e82-0dd4-0310-85a5-a0d7c8717e4f
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | src/screen_file.c | 15 | ||||
| -rw-r--r-- | src/strfsong.c | 16 |
3 files changed, 39 insertions, 3 deletions
@@ -1,10 +1,17 @@ -2006-08.8 Andreas Obergrusberger <tradiaz@yahoo.de> +2006-10-5 Andreas Obergrusberger <tradiaz@yahoo.de> + * Daniel sent me patches that will show the parent + directory in the browse screen title + *...and a patch that allows the user to specify + shortened album names in for example the playlist screen + via %shortalbum% + +2006-08-8 Andreas Obergrusberger <tradiaz@yahoo.de> * Here it is! the splash screen. asking you for password everytime and featuring a nice animation :) * ncmpc will now always ask for a password when it's not permitted to execute a command -2006-08.8 Andreas Obergrusberger <tradiaz@yahoo.de> +2006-08-8 Andreas Obergrusberger <tradiaz@yahoo.de> * Avuton fixed some warning * fixed a bug that doubled empty lines when loading lyrics from hd diff --git a/src/screen_file.c b/src/screen_file.c index 2d8c1dea8..b2d320f0b 100644 --- a/src/screen_file.c +++ b/src/screen_file.c @@ -549,7 +549,20 @@ browse_close(void) static char * browse_title(char *str, size_t size) { - g_snprintf(str, size, _("Browse: %s"), basename(filelist->path)); + char *pathcopy; + char *parentdir; + pathcopy = strdup(filelist->path); + parentdir = dirname(pathcopy); + parentdir = basename(parentdir); + if( parentdir[0] == '.' && strlen(parentdir) == 1 ) + { + parentdir = NULL; + } + g_snprintf(str, size, _("Browse: %s%s%s"), + parentdir ? parentdir : "", + parentdir ? "/" : "", + basename(filelist->path)); + free(pathcopy); return str; } diff --git a/src/strfsong.c b/src/strfsong.c index 3f60875ea..287fcbdce 100644 --- a/src/strfsong.c +++ b/src/strfsong.c @@ -170,6 +170,22 @@ _strfsong(gchar *s, temp = song->title ? utf8_to_locale(song->title) : NULL; else if (strncmp("%album%", p, n) == 0) temp = song->album ? utf8_to_locale(song->album) : NULL; + else if (strncmp("%shortalbum%", p, n) == 0) + { + temp = song->album ? utf8_to_locale(song->album) : NULL; + if (temp) + { + gchar *temp2 = g_strndup(temp, 25); + if (strlen(temp) > 25) + { + temp2[24] = '.'; + temp2[23] = '.'; + temp2[22] = '.'; + } + g_free(temp); + temp = temp2; + } + } else if (strncmp("%track%", p, n) == 0) temp = song->track ? utf8_to_locale(song->track) : NULL; else if (strncmp("%name%", p, n) == 0) |