diff options
| -rw-r--r-- | src/OtherCommands.cxx | 6 | ||||
| -rw-r--r-- | src/Partition.hxx | 4 | ||||
| -rw-r--r-- | src/Playlist.hxx | 2 | ||||
| -rw-r--r-- | src/PlaylistEdit.cxx | 4 | ||||
| -rw-r--r-- | src/SongUpdate.cxx | 10 | ||||
| -rw-r--r-- | src/song.h | 4 |
6 files changed, 15 insertions, 15 deletions
diff --git a/src/OtherCommands.cxx b/src/OtherCommands.cxx index 7aa162b3a..4909f37f5 100644 --- a/src/OtherCommands.cxx +++ b/src/OtherCommands.cxx @@ -116,13 +116,13 @@ handle_lsinfo(Client *client, int argc, char *argv[]) if (strncmp(uri, "file:///", 8) == 0) { /* print information about an arbitrary local file */ - const char *path = uri + 7; + const char *path_utf8 = uri + 7; GError *error = NULL; - if (!client_allow_file(client, path, &error)) + if (!client_allow_file(client, path_utf8, &error)) return print_error(client, error); - struct song *song = song_file_load(path, NULL); + struct song *song = song_file_load(path_utf8, NULL); if (song == NULL) { command_error(client, ACK_ERROR_NO_EXIST, "No such file"); diff --git a/src/Partition.hxx b/src/Partition.hxx index 9efde274a..776f74e2a 100644 --- a/src/Partition.hxx +++ b/src/Partition.hxx @@ -43,9 +43,9 @@ struct Partition { playlist.Clear(pc); } - enum playlist_result AppendFile(const char *path_fs, + enum playlist_result AppendFile(const char *path_utf8, unsigned *added_id=nullptr) { - return playlist.AppendFile(pc, path_fs, added_id); + return playlist.AppendFile(pc, path_utf8, added_id); } enum playlist_result AppendURI(const char *uri_utf8, diff --git a/src/Playlist.hxx b/src/Playlist.hxx index 46a9250a7..c01813322 100644 --- a/src/Playlist.hxx +++ b/src/Playlist.hxx @@ -144,7 +144,7 @@ public: * Note: the caller is responsible for checking permissions. */ enum playlist_result AppendFile(player_control &pc, - const char *path_fs, + const char *path_utf8, unsigned *added_id=nullptr); enum playlist_result AppendURI(player_control &pc, diff --git a/src/PlaylistEdit.cxx b/src/PlaylistEdit.cxx index cdfb77150..138289dd5 100644 --- a/src/PlaylistEdit.cxx +++ b/src/PlaylistEdit.cxx @@ -59,9 +59,9 @@ playlist::Clear(player_control &pc) enum playlist_result playlist::AppendFile(struct player_control &pc, - const char *path_fs, unsigned *added_id) + const char *path_utf8, unsigned *added_id) { - struct song *song = song_file_load(path_fs, NULL); + struct song *song = song_file_load(path_utf8, NULL); if (song == NULL) return PLAYLIST_RESULT_NO_SUCH_SONG; diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx index b96c7c43e..f84a37cea 100644 --- a/src/SongUpdate.cxx +++ b/src/SongUpdate.cxx @@ -45,16 +45,16 @@ extern "C" { #include <stdio.h> struct song * -song_file_load(const char *path, Directory *parent) +song_file_load(const char *path_utf8, Directory *parent) { struct song *song; bool ret; - assert((parent == NULL) == g_path_is_absolute(path)); - assert(!uri_has_scheme(path)); - assert(strchr(path, '\n') == NULL); + assert((parent == NULL) == g_path_is_absolute(path_utf8)); + assert(!uri_has_scheme(path_utf8)); + assert(strchr(path_utf8, '\n') == NULL); - song = song_file_new(path, parent); + song = song_file_new(path_utf8, parent); //in archive ? if (parent != NULL && parent->device == DEVICE_INARCHIVE) { diff --git a/src/song.h b/src/song.h index db582beea..4095317f6 100644 --- a/src/song.h +++ b/src/song.h @@ -76,7 +76,7 @@ song_remote_new(const char *uri); /** allocate a new song with a local file name */ struct song * -song_file_new(const char *path, struct Directory *parent); +song_file_new(const char *path_utf8, struct Directory *parent); /** * allocate a new song structure with a local file name and attempt to @@ -84,7 +84,7 @@ song_file_new(const char *path, struct Directory *parent); * data, NULL is returned. */ struct song * -song_file_load(const char *path, struct Directory *parent); +song_file_load(const char *path_utf8, struct Directory *parent); /** * Replaces the URI of a song object. The given song object is |