From 3203a7dd8ce8db6afcc54d68d63b4f4af7dc4c7f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 26 Jan 2013 01:18:12 +0100 Subject: tag_file: convert to C++ --- src/TagFile.cxx | 94 ++++++++++++++++++++++++++++++ src/TagFile.hxx | 37 ++++++++++++ src/playlist/EmbeddedCuePlaylistPlugin.cxx | 2 +- src/tag_file.c | 90 ---------------------------- src/tag_file.h | 37 ------------ 5 files changed, 132 insertions(+), 128 deletions(-) create mode 100644 src/TagFile.cxx create mode 100644 src/TagFile.hxx delete mode 100644 src/tag_file.c delete mode 100644 src/tag_file.h (limited to 'src') diff --git a/src/TagFile.cxx b/src/TagFile.cxx new file mode 100644 index 000000000..edb1f267e --- /dev/null +++ b/src/TagFile.cxx @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2003-2013 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 "TagFile.hxx" + +extern "C" { +#include "uri.h" +#include "decoder_list.h" +} + +#include "decoder_plugin.h" +#include "input_stream.h" + +#include +#include /* for SEEK_SET */ + +bool +tag_file_scan(const char *path_fs, + const struct tag_handler *handler, void *handler_ctx) +{ + assert(path_fs != NULL); + assert(handler != NULL); + + /* check if there's a suffix and a plugin */ + + const char *suffix = uri_get_suffix(path_fs); + if (suffix == NULL) + return false; + + const struct decoder_plugin *plugin = + decoder_plugin_from_suffix(suffix, NULL); + if (plugin == NULL) + return false; + + struct input_stream *is = NULL; + GMutex *mutex = NULL; + GCond *cond = NULL; + + do { + /* load file tag */ + if (decoder_plugin_scan_file(plugin, path_fs, + handler, handler_ctx)) + break; + + /* fall back to stream tag */ + if (plugin->scan_stream != NULL) { + /* open the input_stream (if not already + open) */ + if (is == NULL) { + mutex = g_mutex_new(); + cond = g_cond_new(); + is = input_stream_open(path_fs, mutex, cond, + NULL); + } + + /* now try the stream_tag() method */ + if (is != NULL) { + if (decoder_plugin_scan_stream(plugin, is, + handler, + handler_ctx)) + break; + + input_stream_lock_seek(is, 0, SEEK_SET, NULL); + } + } + + plugin = decoder_plugin_from_suffix(suffix, plugin); + } while (plugin != NULL); + + if (is != NULL) { + input_stream_close(is); + g_cond_free(cond); + g_mutex_free(mutex); + } + + return plugin != NULL; +} diff --git a/src/TagFile.hxx b/src/TagFile.hxx new file mode 100644 index 000000000..61f491854 --- /dev/null +++ b/src/TagFile.hxx @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2003-2013 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. + */ + +#ifndef MPD_TAG_FILE_HXX +#define MPD_TAG_FILE_HXX + +#include "check.h" + +#include + +struct tag_handler; + +/** + * Scan the tags of a song file. Invokes matching decoder plugins, + * but does not invoke the special "APE" and "ID3" scanners. + */ +bool +tag_file_scan(const char *path_fs, + const struct tag_handler *handler, void *handler_ctx); + +#endif diff --git a/src/playlist/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/EmbeddedCuePlaylistPlugin.cxx index 2337f806e..5cd941df6 100644 --- a/src/playlist/EmbeddedCuePlaylistPlugin.cxx +++ b/src/playlist/EmbeddedCuePlaylistPlugin.cxx @@ -29,9 +29,9 @@ #include "tag.h" #include "tag_handler.h" #include "song.h" +#include "TagFile.hxx" extern "C" { -#include "tag_file.h" #include "tag_ape.h" #include "tag_id3.h" #include "cue/cue_parser.h" diff --git a/src/tag_file.c b/src/tag_file.c deleted file mode 100644 index 8d8a0f5fb..000000000 --- a/src/tag_file.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2003-2012 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 "tag_file.h" -#include "uri.h" -#include "decoder_list.h" -#include "decoder_plugin.h" -#include "input_stream.h" - -#include -#include /* for SEEK_SET */ - -bool -tag_file_scan(const char *path_fs, - const struct tag_handler *handler, void *handler_ctx) -{ - assert(path_fs != NULL); - assert(handler != NULL); - - /* check if there's a suffix and a plugin */ - - const char *suffix = uri_get_suffix(path_fs); - if (suffix == NULL) - return false; - - const struct decoder_plugin *plugin = - decoder_plugin_from_suffix(suffix, NULL); - if (plugin == NULL) - return false; - - struct input_stream *is = NULL; - GMutex *mutex = NULL; - GCond *cond = NULL; - - do { - /* load file tag */ - if (decoder_plugin_scan_file(plugin, path_fs, - handler, handler_ctx)) - break; - - /* fall back to stream tag */ - if (plugin->scan_stream != NULL) { - /* open the input_stream (if not already - open) */ - if (is == NULL) { - mutex = g_mutex_new(); - cond = g_cond_new(); - is = input_stream_open(path_fs, mutex, cond, - NULL); - } - - /* now try the stream_tag() method */ - if (is != NULL) { - if (decoder_plugin_scan_stream(plugin, is, - handler, - handler_ctx)) - break; - - input_stream_lock_seek(is, 0, SEEK_SET, NULL); - } - } - - plugin = decoder_plugin_from_suffix(suffix, plugin); - } while (plugin != NULL); - - if (is != NULL) { - input_stream_close(is); - g_cond_free(cond); - g_mutex_free(mutex); - } - - return plugin != NULL; -} diff --git a/src/tag_file.h b/src/tag_file.h deleted file mode 100644 index 8cf1af3cb..000000000 --- a/src/tag_file.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2003-2012 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. - */ - -#ifndef MPD_TAG_FILE_H -#define MPD_TAG_FILE_H - -#include "check.h" - -#include - -struct tag_handler; - -/** - * Scan the tags of a song file. Invokes matching decoder plugins, - * but does not invoke the special "APE" and "ID3" scanners. - */ -bool -tag_file_scan(const char *path_fs, - const struct tag_handler *handler, void *handler_ctx); - -#endif -- cgit v1.2.3