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

queue/Queue{Save,Print}: remove redundant "Queue" prefix from file name

This commit is contained in:
Max Kellermann 2022-02-14 06:08:11 +01:00
parent 90d52b6501
commit 4b41e766c6
7 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -330,8 +330,8 @@ sources = [
'src/playlist/Print.cxx', 'src/playlist/Print.cxx',
'src/db/PlaylistVector.cxx', 'src/db/PlaylistVector.cxx',
'src/queue/Queue.cxx', 'src/queue/Queue.cxx',
'src/queue/QueuePrint.cxx', 'src/queue/Print.cxx',
'src/queue/QueueSave.cxx', 'src/queue/Save.cxx',
'src/queue/Playlist.cxx', 'src/queue/Playlist.cxx',
'src/queue/PlaylistControl.cxx', 'src/queue/PlaylistControl.cxx',
'src/queue/PlaylistEdit.cxx', 'src/queue/PlaylistEdit.cxx',

2
src/PlaylistPrint.cxx
View File

@ -21,7 +21,7 @@
#include "PlaylistFile.hxx" #include "PlaylistFile.hxx"
#include "PlaylistError.hxx" #include "PlaylistError.hxx"
#include "queue/Playlist.hxx" #include "queue/Playlist.hxx"
#include "queue/QueuePrint.hxx" #include "queue/Print.hxx"
#include "protocol/RangeArg.hxx" #include "protocol/RangeArg.hxx"
#define SONG_FILE "file: " #define SONG_FILE "file: "

2
src/queue/PlaylistState.cxx
View File

@ -27,7 +27,7 @@
#include "Playlist.hxx" #include "Playlist.hxx"
#include "SingleMode.hxx" #include "SingleMode.hxx"
#include "StateFileConfig.hxx" #include "StateFileConfig.hxx"
#include "queue/QueueSave.hxx" #include "Save.hxx"
#include "io/LineReader.hxx" #include "io/LineReader.hxx"
#include "io/BufferedOutputStream.hxx" #include "io/BufferedOutputStream.hxx"
#include "player/Control.hxx" #include "player/Control.hxx"

2
src/queue/QueuePrint.cxx → src/queue/Print.cxx
View File

@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "QueuePrint.hxx" #include "Print.hxx"
#include "Queue.hxx" #include "Queue.hxx"
#include "song/Filter.hxx" #include "song/Filter.hxx"
#include "SongPrint.hxx" #include "SongPrint.hxx"

5
src/queue/QueuePrint.hxx → src/queue/Print.hxx
View File

@ -22,8 +22,7 @@
* client. * client.
*/ */
#ifndef MPD_QUEUE_PRINT_HXX #pragma once
#define MPD_QUEUE_PRINT_HXX
#include <cstdint> #include <cstdint>
@ -52,5 +51,3 @@ queue_print_changes_position(Response &r, const Queue &queue,
void void
queue_find(Response &response, const Queue &queue, queue_find(Response &response, const Queue &queue,
const SongFilter &filter); const SongFilter &filter);
#endif

2
src/queue/QueueSave.cxx → src/queue/Save.cxx
View File

@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "QueueSave.hxx" #include "Save.hxx"
#include "Queue.hxx" #include "Queue.hxx"
#include "PlaylistError.hxx" #include "PlaylistError.hxx"
#include "song/DetachedSong.hxx" #include "song/DetachedSong.hxx"

5
src/queue/QueueSave.hxx → src/queue/Save.hxx
View File

@ -22,8 +22,7 @@
* back into memory. * back into memory.
*/ */
#ifndef MPD_QUEUE_SAVE_HXX #pragma once
#define MPD_QUEUE_SAVE_HXX
struct Queue; struct Queue;
class BufferedOutputStream; class BufferedOutputStream;
@ -41,5 +40,3 @@ queue_save(BufferedOutputStream &os, const Queue &queue);
void void
queue_load_song(LineReader &file, const SongLoader &loader, queue_load_song(LineReader &file, const SongLoader &loader,
const char *line, Queue &queue); const char *line, Queue &queue);
#endif