Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
67b46a15
Commit
67b46a15
authored
Jan 02, 2013
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playlist_{any,song,queue}: convert to C++
parent
83c7e1e1
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
41 additions
and
39 deletions
+41
-39
Makefile.am
Makefile.am
+4
-7
PlaylistAny.cxx
src/PlaylistAny.cxx
+6
-3
PlaylistAny.hxx
src/PlaylistAny.hxx
+3
-3
PlaylistCommands.cxx
src/PlaylistCommands.cxx
+2
-2
PlaylistMapper.cxx
src/PlaylistMapper.cxx
+2
-2
PlaylistMapper.hxx
src/PlaylistMapper.hxx
+3
-7
PlaylistPrint.cxx
src/PlaylistPrint.cxx
+3
-3
PlaylistQueue.cxx
src/PlaylistQueue.cxx
+7
-4
PlaylistQueue.hxx
src/PlaylistQueue.hxx
+3
-3
PlaylistSong.cxx
src/PlaylistSong.cxx
+5
-2
PlaylistSong.hxx
src/PlaylistSong.hxx
+3
-3
No files found.
Makefile.am
View file @
67b46a15
...
@@ -151,9 +151,6 @@ mpd_headers = \
...
@@ -151,9 +151,6 @@ mpd_headers = \
src/playlist_state.h
\
src/playlist_state.h
\
src/playlist_plugin.h
\
src/playlist_plugin.h
\
src/playlist_list.h
\
src/playlist_list.h
\
src/playlist_any.h
\
src/playlist_song.h
\
src/playlist_queue.h
\
src/playlist_vector.h
\
src/playlist_vector.h
\
src/playlist_database.h
\
src/playlist_database.h
\
src/playlist/extm3u_playlist_plugin.h
\
src/playlist/extm3u_playlist_plugin.h
\
...
@@ -317,11 +314,11 @@ src_mpd_SOURCES = \
...
@@ -317,11 +314,11 @@ src_mpd_SOURCES = \
src/playlist_edit.c
\
src/playlist_edit.c
\
src/PlaylistPrint.cxx src/PlaylistPrint.hxx
\
src/PlaylistPrint.cxx src/PlaylistPrint.hxx
\
src/PlaylistSave.cxx src/PlaylistSave.hxx
\
src/PlaylistSave.cxx src/PlaylistSave.hxx
\
src/PlaylistMapper.cxx src/PlaylistMapper.h
\
src/PlaylistMapper.cxx src/PlaylistMapper.h
xx
\
src/
playlist_any.c
\
src/
PlaylistAny.cxx src/PlaylistAny.hxx
\
src/
playlist_song.c
\
src/
PlaylistSong.cxx src/PlaylistSong.hxx
\
src/playlist_state.c
\
src/playlist_state.c
\
src/
playlist_queue.c
\
src/
PlaylistQueue.cxx src/PlaylistQueue.hxx
\
src/playlist_vector.c
\
src/playlist_vector.c
\
src/playlist_database.c
\
src/playlist_database.c
\
src/queue.c
\
src/queue.c
\
...
...
src/
playlist_any.c
→
src/
PlaylistAny.cxx
View file @
67b46a15
/*
/*
* Copyright (C) 2003-201
1
The Music Player Daemon Project
* Copyright (C) 2003-201
3
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,11 +18,14 @@
...
@@ -18,11 +18,14 @@
*/
*/
#include "config.h"
#include "config.h"
#include "playlist_any.h"
#include "PlaylistAny.hxx"
#include "PlaylistMapper.hxx"
extern
"C"
{
#include "playlist_list.h"
#include "playlist_list.h"
#include "PlaylistMapper.h"
#include "uri.h"
#include "uri.h"
#include "input_stream.h"
#include "input_stream.h"
}
#include <assert.h>
#include <assert.h>
...
...
src/
playlist_any.h
→
src/
PlaylistAny.hxx
View file @
67b46a15
/*
/*
* Copyright (C) 2003-201
1
The Music Player Daemon Project
* Copyright (C) 2003-201
3
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 @@
...
@@ -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_PLAYLIST_ANY_H
#ifndef MPD_PLAYLIST_ANY_H
XX
#define MPD_PLAYLIST_ANY_H
#define MPD_PLAYLIST_ANY_H
XX
#include <glib.h>
#include <glib.h>
...
...
src/PlaylistCommands.cxx
View file @
67b46a15
/*
/*
* Copyright (C) 2003-201
2
The Music Player Daemon Project
* Copyright (C) 2003-201
3
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
...
@@ -24,12 +24,12 @@
...
@@ -24,12 +24,12 @@
#include "PlaylistPrint.hxx"
#include "PlaylistPrint.hxx"
#include "PlaylistSave.hxx"
#include "PlaylistSave.hxx"
#include "PlaylistFile.hxx"
#include "PlaylistFile.hxx"
#include "PlaylistQueue.hxx"
extern
"C"
{
extern
"C"
{
#include "protocol/argparser.h"
#include "protocol/argparser.h"
#include "protocol/result.h"
#include "protocol/result.h"
#include "playlist.h"
#include "playlist.h"
#include "playlist_queue.h"
#include "time_print.h"
#include "time_print.h"
#include "ls.h"
#include "ls.h"
#include "uri.h"
#include "uri.h"
...
...
src/PlaylistMapper.cxx
View file @
67b46a15
/*
/*
* Copyright (C) 2003-201
2
The Music Player Daemon Project
* Copyright (C) 2003-201
3
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,7 +18,7 @@
...
@@ -18,7 +18,7 @@
*/
*/
#include "config.h"
#include "config.h"
#include "PlaylistMapper.h"
#include "PlaylistMapper.h
xx
"
#include "PlaylistFile.hxx"
#include "PlaylistFile.hxx"
extern
"C"
{
extern
"C"
{
...
...
src/PlaylistMapper.h
→
src/PlaylistMapper.h
xx
View file @
67b46a15
/*
/*
* Copyright (C) 2003-201
2
The Music Player Daemon Project
* Copyright (C) 2003-201
3
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,15 +17,13 @@
...
@@ -17,15 +17,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
*/
#ifndef MPD_PLAYLIST_MAPPER_H
#ifndef MPD_PLAYLIST_MAPPER_H
XX
#define MPD_PLAYLIST_MAPPER_H
#define MPD_PLAYLIST_MAPPER_H
XX
#include <glib.h>
#include <glib.h>
struct
input_stream
;
struct
input_stream
;
G_BEGIN_DECLS
/**
/**
* Opens a playlist from an URI relative to the playlist or music
* Opens a playlist from an URI relative to the playlist or music
* directory.
* directory.
...
@@ -38,6 +36,4 @@ struct playlist_provider *
...
@@ -38,6 +36,4 @@ struct playlist_provider *
playlist_mapper_open
(
const
char
*
uri
,
GMutex
*
mutex
,
GCond
*
cond
,
playlist_mapper_open
(
const
char
*
uri
,
GMutex
*
mutex
,
GCond
*
cond
,
struct
input_stream
**
is_r
);
struct
input_stream
**
is_r
);
G_END_DECLS
#endif
#endif
src/PlaylistPrint.cxx
View file @
67b46a15
/*
/*
* Copyright (C) 2003-201
2
The Music Player Daemon Project
* Copyright (C) 2003-201
3
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
...
@@ -20,13 +20,13 @@
...
@@ -20,13 +20,13 @@
#include "config.h"
#include "config.h"
#include "PlaylistPrint.hxx"
#include "PlaylistPrint.hxx"
#include "PlaylistFile.hxx"
#include "PlaylistFile.hxx"
#include "PlaylistAny.hxx"
#include "PlaylistSong.hxx"
#include "QueuePrint.hxx"
#include "QueuePrint.hxx"
extern
"C"
{
extern
"C"
{
#include "playlist_list.h"
#include "playlist_list.h"
#include "playlist_plugin.h"
#include "playlist_plugin.h"
#include "playlist_any.h"
#include "playlist_song.h"
#include "playlist.h"
#include "playlist.h"
#include "song_print.h"
#include "song_print.h"
#include "song.h"
#include "song.h"
...
...
src/
playlist_queue.c
→
src/
PlaylistQueue.cxx
View file @
67b46a15
/*
/*
* Copyright (C) 2003-201
1
The Music Player Daemon Project
* Copyright (C) 2003-201
3
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,13 +18,16 @@
...
@@ -18,13 +18,16 @@
*/
*/
#include "config.h"
#include "config.h"
#include "
playlist_queue.h
"
#include "
PlaylistQueue.hxx
"
#include "playlist_plugin.h"
#include "playlist_plugin.h"
#include "playlist_any.h"
#include "PlaylistAny.hxx"
#include "playlist_song.h"
#include "PlaylistSong.hxx"
extern
"C"
{
#include "playlist.h"
#include "playlist.h"
#include "song.h"
#include "song.h"
#include "input_stream.h"
#include "input_stream.h"
}
enum
playlist_result
enum
playlist_result
playlist_load_into_queue
(
const
char
*
uri
,
struct
playlist_provider
*
source
,
playlist_load_into_queue
(
const
char
*
uri
,
struct
playlist_provider
*
source
,
...
...
src/
playlist_queue.h
→
src/
PlaylistQueue.hxx
View file @
67b46a15
/*
/*
* Copyright (C) 2003-201
1
The Music Player Daemon Project
* Copyright (C) 2003-201
3
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
...
@@ -21,8 +21,8 @@
...
@@ -21,8 +21,8 @@
* \brief Glue between playlist plugin and the play queue
* \brief Glue between playlist plugin and the play queue
*/
*/
#ifndef MPD_PLAYLIST_QUEUE_H
#ifndef MPD_PLAYLIST_QUEUE_H
XX
#define MPD_PLAYLIST_QUEUE_H
#define MPD_PLAYLIST_QUEUE_H
XX
#include "playlist_error.h"
#include "playlist_error.h"
...
...
src/
playlist_song.c
→
src/
PlaylistSong.cxx
View file @
67b46a15
/*
/*
* Copyright (C) 2003-201
1
The Music Player Daemon Project
* Copyright (C) 2003-201
3
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,7 +18,9 @@
...
@@ -18,7 +18,9 @@
*/
*/
#include "config.h"
#include "config.h"
#include "playlist_song.h"
#include "PlaylistSong.hxx"
extern
"C"
{
#include "database.h"
#include "database.h"
#include "mapper.h"
#include "mapper.h"
#include "song.h"
#include "song.h"
...
@@ -26,6 +28,7 @@
...
@@ -26,6 +28,7 @@
#include "path.h"
#include "path.h"
#include "ls.h"
#include "ls.h"
#include "tag.h"
#include "tag.h"
}
#include <assert.h>
#include <assert.h>
#include <string.h>
#include <string.h>
...
...
src/
playlist_song.h
→
src/
PlaylistSong.hxx
View file @
67b46a15
/*
/*
* Copyright (C) 2003-201
1
The Music Player Daemon Project
* Copyright (C) 2003-201
3
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 @@
...
@@ -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_PLAYLIST_SONG_H
#ifndef MPD_PLAYLIST_SONG_H
XX
#define MPD_PLAYLIST_SONG_H
#define MPD_PLAYLIST_SONG_H
XX
#include <stdbool.h>
#include <stdbool.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment