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

song_sort: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-04-17 22:25:57 +02:00
parent 9e5d2c5bb7
commit 31bc94160a
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -88,7 +88,6 @@ mpd_headers = \
src/replay_gain_ape.h \ src/replay_gain_ape.h \
src/TimePrint.cxx src/TimePrint.hxx \ src/TimePrint.cxx src/TimePrint.hxx \
src/song.h \ src/song.h \
src/song_sort.c src/song_sort.h \
src/stats.h \ src/stats.h \
src/tag.h \ src/tag.h \
src/tag_internal.h \ src/tag_internal.h \
@ -226,6 +225,7 @@ src_mpd_SOURCES = \
src/SongUpdate.cxx \ src/SongUpdate.cxx \
src/SongPrint.cxx src/SongPrint.hxx \ src/SongPrint.cxx src/SongPrint.hxx \
src/SongSave.cxx src/SongSave.hxx \ src/SongSave.cxx src/SongSave.hxx \
src/SongSort.cxx src/SongSort.hxx \
src/resolver.c src/resolver.h \ src/resolver.c src/resolver.h \
src/SocketUtil.cxx src/SocketUtil.hxx \ src/SocketUtil.cxx src/SocketUtil.hxx \
src/StateFile.cxx src/StateFile.hxx \ src/StateFile.cxx src/StateFile.hxx \
@ -1054,7 +1054,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
src/Directory.cxx src/DirectorySave.cxx \ src/Directory.cxx src/DirectorySave.cxx \
src/PlaylistVector.cxx src/PlaylistDatabase.cxx \ src/PlaylistVector.cxx src/PlaylistDatabase.cxx \
src/DatabaseLock.cxx src/DatabaseSave.cxx \ src/DatabaseLock.cxx src/DatabaseSave.cxx \
src/Song.cxx src/song_sort.c src/SongSave.cxx \ src/Song.cxx src/SongSave.cxx src/SongSort.cxx \
src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \ src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
src/SongFilter.cxx \ src/SongFilter.cxx \
src/TextFile.cxx src/TextFile.cxx

2
src/Directory.cxx
View File

@ -22,10 +22,10 @@
#include "SongFilter.hxx" #include "SongFilter.hxx"
#include "PlaylistVector.hxx" #include "PlaylistVector.hxx"
#include "DatabaseLock.hxx" #include "DatabaseLock.hxx"
#include "SongSort.hxx"
extern "C" { extern "C" {
#include "song.h" #include "song.h"
#include "song_sort.h"
#include "util/list_sort.h" #include "util/list_sort.h"
} }

9
src/song_sort.c → src/SongSort.cxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2012 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -18,12 +18,15 @@
*/ */
#include "config.h" #include "config.h"
#include "song_sort.h" #include "SongSort.hxx"
#include "song.h" #include "song.h"
#include "util/list.h" #include "util/list.h"
#include "util/list_sort.h"
#include "tag.h" #include "tag.h"
extern "C" {
#include "util/list_sort.h"
}
#include <glib.h> #include <glib.h>
#include <assert.h> #include <assert.h>

6
src/song_sort.h → src/SongSort.hxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2012 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * 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. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_SONG_SORT_H #ifndef MPD_SONG_SORT_HXX
#define MPD_SONG_SORT_H #define MPD_SONG_SORT_HXX
struct list_head; struct list_head;