![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/utils.c b/src/utils.c
index 5f5940b032027bc18382bc9f7ab8ab4a11f57ced..d46f521f53b9ff9e816e9b1898d7145d85ef6b58 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
-/*
- * $Id$
- *
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "utils.h"
#include "options.h"
-#include "support.h"
+#include "charset.h"
+#include "i18n.h"
+#include "mpdclient.h"
#include <ctype.h>
#include <stdlib.h>
return list;
}
-/* create a list suiteble for GCompletion from path */
+/* create a list suitable for GCompletion from path */
GList *
-gcmp_list_from_path(mpdclient_t *c, const gchar *path, GList *list, gint types)
+gcmp_list_from_path(struct mpdclient *c, const gchar *path,
+ GList *list, gint types)
{
- guint i;
- mpdclient_filelist_t *filelist;
-
- if ((filelist = mpdclient_filelist_get(c, path)) == NULL)
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ if (connection == NULL)
return list;
- for (i = 0; i < filelist_length(filelist); ++i) {
- struct filelist_entry *entry = filelist_get(filelist, i);
- mpd_InfoEntity *entity = entry ? entry->entity : NULL;
- char *name = NULL;
+ mpd_send_list_meta(connection, path);
- if (entity && entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY &&
+ struct mpd_entity *entity;
+ while ((entity = mpd_recv_entity(connection)) != NULL) {
+ char *name;
+
+ if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_DIRECTORY &&
types & GCMP_TYPE_DIR) {
- mpd_Directory *dir = entity->info.directory;
- gchar *tmp = utf8_to_locale(dir->path);
+ const struct mpd_directory *dir =
+ mpd_entity_get_directory(entity);
+ gchar *tmp = utf8_to_locale(mpd_directory_get_path(dir));
gsize size = strlen(tmp)+2;
name = g_malloc(size);
g_strlcpy(name, tmp, size);
g_strlcat(name, "/", size);
g_free(tmp);
- } else if (entity &&
- entity->type == MPD_INFO_ENTITY_TYPE_SONG &&
+ } else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG &&
types & GCMP_TYPE_FILE) {
- mpd_Song *song = entity->info.song;
- name = utf8_to_locale(song->file);
- } else if (entity &&
- entity->type == MPD_INFO_ENTITY_TYPE_PLAYLISTFILE &&
+ const struct mpd_song *song =
+ mpd_entity_get_song(entity);
+ name = utf8_to_locale(mpd_song_get_uri(song));
+ } else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST &&
types & GCMP_TYPE_PLAYLIST) {
- mpd_PlaylistFile *plf = entity->info.playlistFile;
- name = utf8_to_locale(plf->path);
+ const struct mpd_playlist *playlist =
+ mpd_entity_get_playlist(entity);
+ name = utf8_to_locale(mpd_playlist_get_path(playlist));
+ } else {
+ mpd_entity_free(entity);
+ continue;
}
- if (name)
- list = g_list_append(list, name);
+ list = g_list_append(list, name);
+ mpd_entity_free(entity);
}
- filelist_free(filelist);
return list;
}
+
+void
+format_duration_short(char *buffer, size_t length, unsigned duration)
+{
+ if (duration < 3600)
+ g_snprintf(buffer, length,
+ "%i:%02i", duration / 60, duration % 60);
+ else
+ g_snprintf(buffer, length,
+ "%i:%02i:%02i", duration / 3600,
+ (duration % 3600) / 60, duration % 60);
+}
+
+void
+format_duration_long(char *p, size_t length, unsigned long duration)
+{
+ unsigned bytes_written = 0;
+
+ if (duration / 31536000 > 0) {
+ if (duration / 31536000 == 1)
+ bytes_written = g_snprintf(p, length, "%d %s, ", 1, _("year"));
+ else
+ bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 31536000, _("years"));
+ duration %= 31536000;
+ length -= bytes_written;
+ p += bytes_written;
+ }
+ if (duration / 604800 > 0) {
+ if (duration / 604800 == 1)
+ bytes_written = g_snprintf(p, length, "%d %s, ",
+ 1, _("week"));
+ else
+ bytes_written = g_snprintf(p, length, "%lu %s, ",
+ duration / 604800, _("weeks"));
+ duration %= 604800;
+ length -= bytes_written;
+ p += bytes_written;
+ }
+ if (duration / 86400 > 0) {
+ if (duration / 86400 == 1)
+ bytes_written = g_snprintf(p, length, "%d %s, ",
+ 1, _("day"));
+ else
+ bytes_written = g_snprintf(p, length, "%lu %s, ",
+ duration / 86400, _("days"));
+ duration %= 86400;
+ length -= bytes_written;
+ p += bytes_written;
+ }
+
+ g_snprintf(p, length, "%02lu:%02lu:%02lu", duration / 3600,
+ duration % 3600 / 60, duration % 3600 % 60);
+}