oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Log: new logging library API

Browse Source 
Prepare to migrate away from GLib.  Currently, we're still using GLib
as a backend.
This commit is contained in:
Max Kellermann
2013-09-27 22:31:24 +02:00
parent c53492a76a
commit 060814daa8
162 changed files with 1992 additions and 1280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tag/Aiff.cxx
View File

@@ -19,6 +19,8 @@
#include "config.h" /* must be first for large file support */
#include "Aiff.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
#include <glib.h>
@@ -26,11 +28,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "aiff"
static constexpr Domain aiff_domain("aiff");
struct aiff_header {
char id[4];
@@ -50,15 +50,14 @@ aiff_seek_id3(FILE *file)
struct stat st;
if (fstat(fileno(file), &st) < 0) {
g_warning("Failed to stat file descriptor: %s",
g_strerror(errno));
LogErrno(aiff_domain, "Failed to stat file descriptor");
return 0;
}
/* seek to the beginning and read the AIFF header */
if (fseek(file, 0, SEEK_SET) != 0) {
g_warning("Failed to seek: %s", g_strerror(errno));
LogErrno(aiff_domain, "Failed to seek");
return 0;
}

11
src/tag/Riff.cxx
View File

@@ -19,6 +19,8 @@
#include "config.h" /* must be first for large file support */
#include "Riff.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
#include <glib.h>
@@ -26,11 +28,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "riff"
static constexpr Domain riff_domain("riff");
struct riff_header {
char id[4];
@@ -50,15 +50,14 @@ riff_seek_id3(FILE *file)
struct stat st;
if (fstat(fileno(file), &st) < 0) {
g_warning("Failed to stat file descriptor: %s",
g_strerror(errno));
LogErrno(riff_domain, "Failed to stat file descriptor");
return 0;
}
/* seek to the beginning and read the RIFF header */
if (fseek(file, 0, SEEK_SET) != 0) {
g_warning("Failed to seek: %s", g_strerror(errno));
LogErrno(riff_domain, "Failed to seek");
return 0;
}

16
src/tag/TagId3.cxx
View File

@@ -24,6 +24,8 @@
#include "Tag.hxx"
#include "TagBuilder.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
#include "ConfigGlobal.hxx"
#include "Riff.hxx"
#include "Aiff.hxx"
@@ -36,9 +38,6 @@
#include <errno.h>
#include <string.h>
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "id3"
# ifndef ID3_FRAME_COMPOSER
# define ID3_FRAME_COMPOSER "TCOM"
# endif
@@ -58,6 +57,8 @@
#define ID3_FRAME_ALBUM_ARTIST "TPE2"
#endif
static constexpr Domain id3_domain("id3");
static inline bool
tag_is_id3v1(struct id3_tag *tag)
{
@@ -104,8 +105,9 @@ import_id3_string(bool is_id3v1, const id3_ucs4_t *ucs4)
nullptr, nullptr,
nullptr, nullptr);
if (utf8 == nullptr) {
g_debug("Unable to convert %s string to UTF-8: '%s'",
encoding, isostr);
FormatWarning(id3_domain,
"Unable to convert %s string to UTF-8: '%s'",
encoding, isostr);
g_free(isostr);
return nullptr;
}
@@ -526,7 +528,7 @@ tag_id3_riff_aiff_load(FILE *file)
id3_byte_t *buffer = (id3_byte_t *)g_malloc(size);
size_t ret = fread(buffer, size, 1, file);
if (ret != 1) {
g_warning("Failed to read RIFF chunk");
LogWarning(id3_domain, "Failed to read RIFF chunk");
g_free(buffer);
return nullptr;
}
@@ -564,7 +566,7 @@ tag_id3_scan(const char *path_fs,
struct id3_tag *tag = tag_id3_load(path_fs, error);
if (tag == nullptr) {
if (error.IsDefined())
g_warning("%s", error.GetMessage());
LogError(error);
return false;
}