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

db_save, state_file: convert to C++

Browse Source
This commit is contained in:
Max Kellermann
2013-01-02 19:52:57 +01:00
parent 4b0b8315a9
commit b715e522cf
26 changed files with 120 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/DatabaseGlue.cxx
View File

@@ -20,11 +20,11 @@
#include "config.h"
#include "DatabaseGlue.hxx"
#include "DatabaseRegistry.hxx"
#include "DatabaseSave.hxx"
extern "C" {
#include "database.h"
#include "db_error.h"
#include "db_save.h"
#include "stats.h"
#include "conf.h"
#include "glib_compat.h"

7
src/db_save.c → src/DatabaseSave.cxx
View File

@@ -18,15 +18,18 @@
*/
#include "config.h"
#include "db_save.h"
#include "DatabaseSave.hxx"
#include "db_lock.h"
#include "directory.h"
#include "directory_save.h"
#include "DirectorySave.hxx"
#include "song.h"
extern "C" {
#include "path.h"
#include "text_file.h"
#include "tag.h"
#include "tag_internal.h"
}
#include <glib.h>

7
src/db_save.h → src/DatabaseSave.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
@@ -17,12 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_DB_SAVE_H
#define MPD_DB_SAVE_H
#ifndef MPD_DATABASE_SAVE_HXX
#define MPD_DATABASE_SAVE_HXX
#include "gerror.h"
#include <stdbool.h>
#include <stdio.h>
struct directory;

13
src/directory_save.c → src/DirectorySave.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,12 +18,15 @@
*/
#include "config.h"
#include "directory_save.h"
#include "DirectorySave.hxx"
#include "directory.h"
#include "song.h"
#include "SongSave.hxx"
#include "PlaylistDatabase.hxx"
extern "C" {
#include "text_file.h"
#include "song_save.h"
#include "playlist_database.h"
}
#include <assert.h>
#include <string.h>
@@ -152,7 +155,7 @@ directory_load(FILE *fp, struct directory *directory,
if (directory_get_song(directory, name) != NULL) {
g_set_error(error, directory_quark(), 0,
"Duplicate song '%s'", name);
return NULL;
return false;
}
song = song_load(fp, directory, name,

7
src/directory_save.h → src/DirectorySave.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
@@ -17,12 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_DIRECTORY_SAVE_H
#define MPD_DIRECTORY_SAVE_H
#ifndef MPD_DIRECTORY_SAVE_HXX
#define MPD_DIRECTORY_SAVE_HXX
#include <glib.h>
#include <stdbool.h>
#include <stdio.h>
struct directory;

2
src/Main.cxx
View File

@@ -22,6 +22,7 @@
#include "PlaylistFile.hxx"
#include "UpdateGlue.hxx"
#include "chunk.h"
#include "StateFile.hxx"
extern "C" {
#include "daemon.h"
@@ -51,7 +52,6 @@ extern "C" {
#include "decoder_list.h"
#include "input_init.h"
#include "playlist_list.h"
#include "state_file.h"
#include "tag.h"
#include "zeroconf.h"
#include "event_pipe.h"

7
src/output_state.c → src/OutputState.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
@@ -23,9 +23,12 @@
*/
#include "config.h"
#include "output_state.h"
#include "OutputState.hxx"
#include "output_internal.h"
extern "C" {
#include "output_all.h"
}
#include <glib.h>

7
src/output_state.h → src/OutputState.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
@@ -22,10 +22,9 @@
*
*/
#ifndef OUTPUT_STATE_H
#define OUTPUT_STATE_H
#ifndef MPD_OUTPUT_STATE_HXX
#define MPD_OUTPUT_STATE_HXX
#include <stdbool.h>
#include <stdio.h>
bool

13
src/playlist_database.c → src/PlaylistDatabase.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,10 +18,13 @@
*/
#include "config.h"
#include "playlist_database.h"
#include "PlaylistDatabase.hxx"
extern "C" {
#include "playlist_vector.h"
#include "text_file.h"
#include "string_util.h"
}
#include <string.h>
#include <stdlib.h>
@@ -47,9 +50,9 @@ bool
playlist_metadata_load(FILE *fp, struct list_head *pv, const char *name,
GString *buffer, GError **error_r)
{
struct playlist_metadata pm = {
.mtime = 0,
};
struct playlist_metadata pm;
pm.mtime = 0;
char *line, *colon;
const char *value;

7
src/playlist_database.h → src/PlaylistDatabase.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
@@ -17,12 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_PLAYLIST_DATABASE_H
#define MPD_PLAYLIST_DATABASE_H
#ifndef MPD_PLAYLIST_DATABASE_HXX
#define MPD_PLAYLIST_DATABASE_HXX
#include "check.h"
#include <stdbool.h>
#include <stdio.h>
#include <glib.h>

1
src/PlaylistSave.hxx
View File

@@ -22,7 +22,6 @@
#include "playlist_error.h"
#include <stdbool.h>
#include <stdio.h>
struct song;

8
src/playlist_state.c → src/PlaylistState.cxx
View File

@@ -23,13 +23,15 @@
*/
#include "config.h"
#include "playlist_state.h"
#include "PlaylistState.hxx"
#include "QueueSave.hxx"
extern "C" {
#include "playlist.h"
#include "player_control.h"
#include "queue_save.h"
#include "path.h"
#include "text_file.h"
#include "conf.h"
}
#include <string.h>
#include <stdlib.h>

7
src/playlist_state.h → src/PlaylistState.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
@@ -22,11 +22,10 @@
*
*/
#ifndef PLAYLIST_STATE_H
#define PLAYLIST_STATE_H
#ifndef MPD_PLAYLIST_STATE_HXX
#define MPD_PLAYLIST_STATE_HXX
#include <glib.h>
#include <stdbool.h>
#include <stdio.h>
struct playlist;

11
src/queue_save.c → src/QueueSave.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,13 +18,16 @@
*/
#include "config.h"
#include "queue_save.h"
#include "queue.h"
#include "QueueSave.hxx"
#include "song.h"
#include "SongSave.hxx"
extern "C" {
#include "queue.h"
#include "uri.h"
#include "database.h"
#include "song_save.h"
#include "text_file.h"
}
#include <stdlib.h>

6
src/queue_save.h → src/QueueSave.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
@@ -22,8 +22,8 @@
* back into memory.
*/
#ifndef QUEUE_SAVE_H
#define QUEUE_SAVE_H
#ifndef MPD_QUEUE_SAVE_HXX
#define MPD_QUEUE_SAVE_HXX
#include <glib.h>
#include <stdio.h>

9
src/song_save.c → src/SongSave.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,13 +18,16 @@
*/
#include "config.h"
#include "song_save.h"
#include "SongSave.hxx"
#include "song.h"
#include "tag_save.h"
#include "TagSave.hxx"
#include "directory.h"
extern "C" {
#include "tag.h"
#include "text_file.h"
#include "string_util.h"
}
#include <glib.h>

6
src/song_save.h → src/SongSave.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
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_SONG_SAVE_H
#define MPD_SONG_SAVE_H
#ifndef MPD_SONG_SAVE_HXX
#define MPD_SONG_SAVE_HXX
#include <glib.h>

13
src/state_file.c → src/StateFile.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,12 +18,15 @@
*/
#include "config.h"
#include "state_file.h"
#include "output_state.h"
#include "StateFile.hxx"
#include "OutputState.hxx"
#include "playlist.h"
#include "playlist_state.h"
#include "PlaylistState.hxx"
extern "C" {
#include "volume.h"
#include "text_file.h"
}
#include <glib.h>
#include <assert.h>
@@ -117,7 +120,7 @@ state_file_read(struct player_control *pc)
static gboolean
timer_save_state_file(gpointer data)
{
struct player_control *pc = data;
struct player_control *pc = (struct player_control *)data;
if (prev_volume_version == sw_volume_state_get_hash() &&
prev_output_version == audio_output_state_get_version() &&

6
src/state_file.h → src/StateFile.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
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_STATE_FILE_H
#define MPD_STATE_FILE_H
#ifndef MPD_STATE_FILE_HXX
#define MPD_STATE_FILE_HXX
struct player_control;

4
src/tag_save.c → src/TagSave.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 "tag_save.h"
#include "TagSave.hxx"
#include "tag.h"
#include "tag_internal.h"
#include "song.h"

6
src/tag_save.h → src/TagSave.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
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_TAG_SAVE_H
#define MPD_TAG_SAVE_H
#ifndef MPD_TAG_SAVE_HXX
#define MPD_TAG_SAVE_HXX
#include <stdio.h>

2
src/db/SimpleDatabasePlugin.cxx
View File

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

1
src/playlist_global.c
View File

@@ -24,7 +24,6 @@
#include "config.h"
#include "playlist.h"
#include "playlist_state.h"
#include "event_pipe.h"
#include "Main.hxx"