diff options
author | Max Kellermann <max@duempel.org> | 2013-01-02 18:38:32 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2013-01-02 19:19:58 +0100 |
commit | 67b46a151da4ca6f81fa63d30e2c629da352ec45 (patch) | |
tree | 8084b6d63b5c93167a9dde536415dc5aef3ab75e /src/playlist_any.c | |
parent | 83c7e1e129b1250bc73bf75e9378dfbe242b09c7 (diff) | |
download | mpd-67b46a151da4ca6f81fa63d30e2c629da352ec45.tar.gz mpd-67b46a151da4ca6f81fa63d30e2c629da352ec45.tar.xz mpd-67b46a151da4ca6f81fa63d30e2c629da352ec45.zip |
playlist_{any,song,queue}: convert to C++
Diffstat (limited to 'src/playlist_any.c')
-rw-r--r-- | src/playlist_any.c | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/src/playlist_any.c b/src/playlist_any.c deleted file mode 100644 index e4017ac0d..000000000 --- a/src/playlist_any.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2003-2011 The Music Player Daemon Project - * http://www.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 "config.h" -#include "playlist_any.h" -#include "playlist_list.h" -#include "PlaylistMapper.h" -#include "uri.h" -#include "input_stream.h" - -#include <assert.h> - -static struct playlist_provider * -playlist_open_remote(const char *uri, GMutex *mutex, GCond *cond, - struct input_stream **is_r) -{ - assert(uri_has_scheme(uri)); - - struct playlist_provider *playlist = - playlist_list_open_uri(uri, mutex, cond); - if (playlist != NULL) { - *is_r = NULL; - return playlist; - } - - GError *error = NULL; - struct input_stream *is = input_stream_open(uri, mutex, cond, &error); - if (is == NULL) { - if (error != NULL) { - g_warning("Failed to open %s: %s", - uri, error->message); - g_error_free(error); - } - - return NULL; - } - - playlist = playlist_list_open_stream(is, uri); - if (playlist == NULL) { - input_stream_close(is); - return NULL; - } - - *is_r = is; - return playlist; -} - -struct playlist_provider * -playlist_open_any(const char *uri, GMutex *mutex, GCond *cond, - struct input_stream **is_r) -{ - return uri_has_scheme(uri) - ? playlist_open_remote(uri, mutex, cond, is_r) - : playlist_mapper_open(uri, mutex, cond, is_r); -} |