input_stream, main: remove obsolete GLib version checks
MPD requires GLib 2.16.
This commit is contained in:
parent
12be9e818f
commit
a582deee2c
@ -29,10 +29,6 @@
|
|||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#if !GLIB_CHECK_VERSION(2,14,0)
|
|
||||||
typedef gint64 goffset;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct input_stream {
|
struct input_stream {
|
||||||
/**
|
/**
|
||||||
* the plugin which implements this input stream
|
* the plugin which implements this input stream
|
||||||
|
@ -135,10 +135,8 @@ glue_mapper_init(GError **error_r)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if GLIB_CHECK_VERSION(2,14,0)
|
|
||||||
if (music_dir == NULL)
|
if (music_dir == NULL)
|
||||||
music_dir = g_strdup(g_get_user_special_dir(G_USER_DIRECTORY_MUSIC));
|
music_dir = g_strdup(g_get_user_special_dir(G_USER_DIRECTORY_MUSIC));
|
||||||
#endif
|
|
||||||
|
|
||||||
mapper_init(music_dir, playlist_dir);
|
mapper_init(music_dir, playlist_dir);
|
||||||
|
|
||||||
|
@ -58,12 +58,10 @@ lastfm_init(const struct config_param *param)
|
|||||||
|
|
||||||
lastfm_config.user = g_uri_escape_string(user, NULL, false);
|
lastfm_config.user = g_uri_escape_string(user, NULL, false);
|
||||||
|
|
||||||
#if GLIB_CHECK_VERSION(2,16,0)
|
|
||||||
if (strlen(passwd) != 32)
|
if (strlen(passwd) != 32)
|
||||||
lastfm_config.md5 = g_compute_checksum_for_string(G_CHECKSUM_MD5,
|
lastfm_config.md5 = g_compute_checksum_for_string(G_CHECKSUM_MD5,
|
||||||
passwd, strlen(passwd));
|
passwd, strlen(passwd));
|
||||||
else
|
else
|
||||||
#endif
|
|
||||||
lastfm_config.md5 = g_strdup(passwd);
|
lastfm_config.md5 = g_strdup(passwd);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
Reference in New Issue
Block a user