X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Futils.c;h=0c35c9e8e14089efb7483fe1c36374f0ad01221d;hb=373736315529f8b760df043a21ee7526941c8bea;hp=23408f2f2910b5f78f3e4d6eba7c518d1152d186;hpb=b39c1ef247a01c538bf61d8b2bbc0730b9198a9a;p=ncmpc.git

diff --git a/src/utils.c b/src/utils.c
index 23408f2..0c35c9e 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,43 +1,31 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * 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.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "utils.h"
-#include "options.h"
-#include "charset.h"
-#include "i18n.h"
 
-#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 
 GList *
 string_list_free(GList *string_list)
 {
-	GList *list = g_list_first(string_list);
-
-	while (list) {
-		g_free(list->data);
-		list->data = NULL;
-		list = list->next;
-	}
-
-	g_list_free(string_list);
+	g_list_free_full(string_list, g_free);
 	return NULL;
 }
 
@@ -69,105 +57,3 @@ string_list_remove(GList *string_list, const gchar *str)
 	}
 	return list;
 }
-
-/* create a list suitable for GCompletion from path */
-GList *
-gcmp_list_from_path(mpdclient_t *c, const gchar *path, GList *list, gint types)
-{
-	guint i;
-	mpdclient_filelist_t *filelist;
-
-	if ((filelist = mpdclient_filelist_get(c, path)) == NULL)
-		return list;
-
-	for (i = 0; i < filelist_length(filelist); ++i) {
-		const struct filelist_entry *entry = filelist_get(filelist, i);
-		const struct mpd_entity *entity = entry ? entry->entity : NULL;
-		char *name = NULL;
-
-		if (entity != NULL &&
-		    mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_DIRECTORY &&
-		    types & GCMP_TYPE_DIR) {
-			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 != NULL &&
-			   mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG &&
-			   types & GCMP_TYPE_FILE) {
-			const struct mpd_song *song =
-				mpd_entity_get_song(entity);
-			name = utf8_to_locale(mpd_song_get_uri(song));
-		} else if (entity != NULL &&
-			   mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST &&
-			   types & GCMP_TYPE_PLAYLIST) {
-			const struct mpd_playlist *playlist =
-				mpd_entity_get_playlist(entity);
-			name = utf8_to_locale(mpd_playlist_get_path(playlist));
-		}
-
-		if (name)
-			list = g_list_append(list, name);
-	}
-
-	filelist_free(filelist);
-	return list;
-}
-
-char *
-time_seconds_to_durationstr(unsigned long time_seconds)
-{
-	const char *year = _("year");
-	const char *years = _("years");
-	const char *week = _("week");
-	const char *weeks = _("weeks");
-	const char *day = _("day");
-	const char *days = _("days");
-	char *duration;
-	char *iter;
-	unsigned bytes_written = 0;
-	unsigned length = utf8_width(years) +
-		utf8_width(weeks) + utf8_width(days) + 32;
-
-	duration = g_malloc(length);
-	iter = duration;
-	if (time_seconds / 31536000 > 0) {
-		if (time_seconds / 31536000 == 1)
-			bytes_written = g_snprintf(iter, length, "%d %s, ", 1, year);
-		else
-			bytes_written = g_snprintf(iter, length, "%lu %s, ", time_seconds / 31536000, years);
-		time_seconds %= 31536000;
-		length -= bytes_written;
-		iter += bytes_written;
-	}
-	if (time_seconds / 604800 > 0) {
-		if (time_seconds / 604800 == 1)
-			bytes_written = g_snprintf(iter, length, "%d %s, ", 1, week);
-		else
-			bytes_written = g_snprintf(iter, length, "%lu %s, ", time_seconds / 604800, weeks);
-		time_seconds %= 604800;
-		length -= bytes_written;
-		iter += bytes_written;
-	}
-	if (time_seconds / 86400 > 0) {
-		if (time_seconds / 86400 == 1)
-			bytes_written = g_snprintf(iter, length, "%d %s, ", 1, day);
-		else
-			bytes_written = g_snprintf(iter, length, "%lu %s, ", time_seconds / 86400, days);
-		time_seconds %= 86400;
-		length -= bytes_written;
-		iter += bytes_written;
-	}
-	g_snprintf(iter, length, "%02lu:%02lu:%02lu",
-			time_seconds / 3600,
-			time_seconds % 3600 / 60,
-			time_seconds % 3600 % 60);
-	return duration;
-}
-
-