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

db_lock: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-01-02 20:56:21 +01:00
parent 22f0ef6d6b
commit 51a2d09eb7
13 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -234,7 +234,7 @@ src_mpd_SOURCES = \
src/DatabaseQueue.cxx src/DatabaseQueue.hxx \
src/DatabasePlaylist.cxx src/DatabasePlaylist.hxx \
src/db_error.h \
src/db_lock.c src/db_lock.h \
src/DatabaseLock.cxx src/DatabaseLock.hxx \
src/DatabaseSave.cxx src/DatabaseSave.hxx \
src/DatabasePlugin.hxx \
src/DatabaseVisitor.hxx \
@ -1072,7 +1072,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
src/DatabaseSelection.cxx \
src/Directory.cxx src/DirectorySave.cxx \
src/PlaylistVector.cxx src/PlaylistDatabase.cxx \
src/db_lock.c src/DatabaseSave.cxx \
src/DatabaseLock.cxx src/DatabaseSave.cxx \
src/Song.cxx src/song_sort.c src/SongSave.cxx \
src/tag.c src/tag_pool.c src/TagSave.cxx \
src/path.c \

4
src/db_lock.c → src/DatabaseLock.cxx
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2003-2011 The Music Player Daemon Project
* 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
@ -18,7 +18,7 @@
*/
#include "config.h"
#include "db_lock.h"
#include "DatabaseLock.hxx"
#include "gcc.h"
#if GCC_CHECK_VERSION(4, 2)

7
src/db_lock.h → src/DatabaseLock.hxx
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2003-2011 The Music Player Daemon Project
* 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
@ -23,14 +23,13 @@
* multi-threading.
*/
#ifndef MPD_DB_LOCK_H
#define MPD_DB_LOCK_H
#ifndef MPD_DB_LOCK_HXX
#define MPD_DB_LOCK_HXX
#include "check.h"
#include <glib.h>
#include <assert.h>
#include <stdbool.h>
extern GStaticMutex db_mutex;

2
src/DatabaseSave.cxx
View File

@ -19,7 +19,7 @@
#include "config.h"
#include "DatabaseSave.hxx"
#include "db_lock.h"
#include "DatabaseLock.hxx"
#include "directory.h"
#include "DirectorySave.hxx"
#include "song.h"

2
src/Directory.cxx
View File

@ -21,13 +21,13 @@
#include "directory.h"
#include "SongFilter.hxx"
#include "PlaylistVector.hxx"
#include "DatabaseLock.hxx"
extern "C" {
#include "song.h"
#include "song_sort.h"
#include "path.h"
#include "util/list_sort.h"
#include "db_lock.h"
}
#include <glib.h>

2
src/PlaylistVector.cxx
View File

@ -19,7 +19,7 @@
#include "config.h"
#include "PlaylistVector.hxx"
#include "db_lock.h"
#include "DatabaseLock.hxx"
#include <assert.h>
#include <string.h>

2
src/StickerCommands.cxx
View File

@ -20,6 +20,7 @@
#include "config.h"
#include "StickerCommands.hxx"
#include "SongPrint.hxx"
#include "DatabaseLock.hxx"
extern "C" {
#include "protocol/result.h"
@ -27,7 +28,6 @@ extern "C" {
#include "sticker_print.h"
#include "song_sticker.h"
#include "database.h"
#include "db_lock.h"
}
#include <string.h>

2
src/UpdateArchive.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" /* must be first for large file support */
#include "UpdateArchive.hxx"
#include "UpdateInternal.hxx"
#include "db_lock.h"
#include "DatabaseLock.hxx"
#include "directory.h"
#include "song.h"

2
src/UpdateContainer.cxx
View File

@ -21,7 +21,7 @@
#include "UpdateContainer.hxx"
#include "UpdateInternal.hxx"
#include "UpdateDatabase.hxx"
#include "db_lock.h"
#include "DatabaseLock.hxx"
#include "directory.h"
#include "song.h"
#include "decoder_plugin.h"

2
src/UpdateDatabase.cxx
View File

@ -23,7 +23,7 @@
#include "PlaylistVector.hxx"
#include "directory.h"
#include "song.h"
#include "db_lock.h"
#include "DatabaseLock.hxx"
#include <glib.h>
#include <assert.h>

2
src/UpdateSong.cxx
View File

@ -23,7 +23,7 @@
#include "UpdateIO.hxx"
#include "UpdateDatabase.hxx"
#include "UpdateContainer.hxx"
#include "db_lock.h"
#include "DatabaseLock.hxx"
#include "directory.h"
#include "song.h"
#include "decoder_plugin.h"

2
src/UpdateWalk.cxx
View File

@ -23,7 +23,7 @@
#include "UpdateDatabase.hxx"
#include "UpdateSong.hxx"
#include "UpdateArchive.hxx"
#include "db_lock.h"
#include "DatabaseLock.hxx"
#include "directory.h"
#include "song.h"
#include "PlaylistVector.hxx"

4
src/db/SimpleDatabasePlugin.cxx
View File

@ -23,10 +23,10 @@
#include "DatabaseHelpers.hxx"
#include "SongFilter.hxx"
#include "DatabaseSave.hxx"
#include "DatabaseLock.hxx"
#include "db_error.h"
extern "C" {
#include "db_error.h"
#include "db_lock.h"
#include "conf.h"
}