*: use references instead of pointers

1 files changed, 49 insertions, 49 deletions

diff --git a/src/PlayerCommands.cxx b/src/PlayerCommands.cxx
index 9f427d121..8b9a96ca5 100644
--- a/src/PlayerCommands.cxx
+++ b/src/PlayerCommands.cxx
@@ -53,46 +53,46 @@
 #define COMMAND_STATUS_UPDATING_DB	"updating_db"
 
 enum command_return
-handle_play(Client *client, int argc, char *argv[])
+handle_play(Client &client, int argc, char *argv[])
 {
 	int song = -1;
 
 	if (argc == 2 && !check_int(client, &song, argv[1]))
 		return COMMAND_RETURN_ERROR;
-	enum playlist_result result = client->partition.PlayPosition(song);
+	enum playlist_result result = client.partition.PlayPosition(song);
 	return print_playlist_result(client, result);
 }
 
 enum command_return
-handle_playid(Client *client, int argc, char *argv[])
+handle_playid(Client &client, int argc, char *argv[])
 {
 	int id = -1;
 
 	if (argc == 2 && !check_int(client, &id, argv[1]))
 		return COMMAND_RETURN_ERROR;
 
-	enum playlist_result result = client->partition.PlayId(id);
+	enum playlist_result result = client.partition.PlayId(id);
 	return print_playlist_result(client, result);
 }
 
 enum command_return
-handle_stop(Client *client,
+handle_stop(Client &client,
 	    gcc_unused int argc, gcc_unused char *argv[])
 {
-	client->partition.Stop();
+	client.partition.Stop();
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_currentsong(Client *client,
+handle_currentsong(Client &client,
 		   gcc_unused int argc, gcc_unused char *argv[])
 {
-	playlist_print_current(client, &client->playlist);
+	playlist_print_current(client, client.playlist);
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_pause(Client *client,
+handle_pause(Client &client,
 	     int argc, char *argv[])
 {
 	if (argc == 2) {
@@ -100,22 +100,22 @@ handle_pause(Client *client,
 		if (!check_bool(client, &pause_flag, argv[1]))
 			return COMMAND_RETURN_ERROR;
 
-		client->player_control->SetPause(pause_flag);
+		client.player_control.SetPause(pause_flag);
 	} else
-		client->player_control->Pause();
+		client.player_control.Pause();
 
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_status(Client *client,
+handle_status(Client &client,
 	      gcc_unused int argc, gcc_unused char *argv[])
 {
 	const char *state = NULL;
 	int updateJobId;
 	int song;
 
-	const auto player_status = client->player_control->GetStatus();
+	const auto player_status = client.player_control.GetStatus();
 
 	switch (player_status.state) {
 	case PlayerState::STOP:
@@ -129,7 +129,7 @@ handle_status(Client *client,
 		break;
 	}
 
-	const playlist &playlist = client->playlist;
+	const playlist &playlist = client.playlist;
 	client_printf(client,
 		      "volume: %i\n"
 		      COMMAND_STATUS_REPEAT ": %i\n"
@@ -149,9 +149,9 @@ handle_status(Client *client,
 		      playlist.GetConsume(),
 		      (unsigned long)playlist.GetVersion(),
 		      playlist.GetLength(),
-		      (int)(client->player_control->GetCrossFade() + 0.5),
-		      client->player_control->GetMixRampDb(),
-		      client->player_control->GetMixRampDelay(),
+		      (int)(client.player_control.GetCrossFade() + 0.5),
+		      client.player_control.GetMixRampDb(),
+		      client.player_control.GetMixRampDelay(),
 		      state);
 
 	song = playlist.GetCurrentPosition();
@@ -188,7 +188,7 @@ handle_status(Client *client,
 			      updateJobId);
 	}
 
-	Error error = client->player_control->LockGetError();
+	Error error = client.player_control.LockGetError();
 	if (error.IsDefined())
 		client_printf(client,
 			      COMMAND_STATUS_ERROR ": %s\n",
@@ -206,85 +206,85 @@ handle_status(Client *client,
 }
 
 enum command_return
-handle_next(Client *client,
+handle_next(Client &client,
 	    gcc_unused int argc, gcc_unused char *argv[])
 {
-	playlist &playlist = client->playlist;
+	playlist &playlist = client.playlist;
 
 	/* single mode is not considered when this is user who
 	 * wants to change song. */
 	const bool single = playlist.queue.single;
 	playlist.queue.single = false;
 
-	client->partition.PlayNext();
+	client.partition.PlayNext();
 
 	playlist.queue.single = single;
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_previous(Client *client,
+handle_previous(Client &client,
 		gcc_unused int argc, gcc_unused char *argv[])
 {
-	client->partition.PlayPrevious();
+	client.partition.PlayPrevious();
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_repeat(Client *client, gcc_unused int argc, char *argv[])
+handle_repeat(Client &client, gcc_unused int argc, char *argv[])
 {
 	bool status;
 	if (!check_bool(client, &status, argv[1]))
 		return COMMAND_RETURN_ERROR;
 
-	client->partition.SetRepeat(status);
+	client.partition.SetRepeat(status);
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_single(Client *client, gcc_unused int argc, char *argv[])
+handle_single(Client &client, gcc_unused int argc, char *argv[])
 {
 	bool status;
 	if (!check_bool(client, &status, argv[1]))
 		return COMMAND_RETURN_ERROR;
 
-	client->partition.SetSingle(status);
+	client.partition.SetSingle(status);
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_consume(Client *client, gcc_unused int argc, char *argv[])
+handle_consume(Client &client, gcc_unused int argc, char *argv[])
 {
 	bool status;
 	if (!check_bool(client, &status, argv[1]))
 		return COMMAND_RETURN_ERROR;
 
-	client->partition.SetConsume(status);
+	client.partition.SetConsume(status);
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_random(Client *client, gcc_unused int argc, char *argv[])
+handle_random(Client &client, gcc_unused int argc, char *argv[])
 {
 	bool status;
 	if (!check_bool(client, &status, argv[1]))
 		return COMMAND_RETURN_ERROR;
 
-	client->partition.SetRandom(status);
-	audio_output_all_set_replay_gain_mode(replay_gain_get_real_mode(client->partition.GetRandom()));
+	client.partition.SetRandom(status);
+	audio_output_all_set_replay_gain_mode(replay_gain_get_real_mode(client.partition.GetRandom()));
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_clearerror(gcc_unused Client *client,
+handle_clearerror(gcc_unused Client &client,
 		  gcc_unused int argc, gcc_unused char *argv[])
 {
-	client->player_control->ClearError();
+	client.player_control.ClearError();
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_seek(Client *client, gcc_unused int argc, char *argv[])
+handle_seek(Client &client, gcc_unused int argc, char *argv[])
 {
 	unsigned song, seek_time;
 
@@ -294,12 +294,12 @@ handle_seek(Client *client, gcc_unused int argc, char *argv[])
 		return COMMAND_RETURN_ERROR;
 
 	enum playlist_result result =
-		client->partition.SeekSongPosition(song, seek_time);
+		client.partition.SeekSongPosition(song, seek_time);
 	return print_playlist_result(client, result);
 }
 
 enum command_return
-handle_seekid(Client *client, gcc_unused int argc, char *argv[])
+handle_seekid(Client &client, gcc_unused int argc, char *argv[])
 {
 	unsigned id, seek_time;
 
@@ -309,12 +309,12 @@ handle_seekid(Client *client, gcc_unused int argc, char *argv[])
 		return COMMAND_RETURN_ERROR;
 
 	enum playlist_result result =
-		client->partition.SeekSongId(id, seek_time);
+		client.partition.SeekSongId(id, seek_time);
 	return print_playlist_result(client, result);
 }
 
 enum command_return
-handle_seekcur(Client *client, gcc_unused int argc, char *argv[])
+handle_seekcur(Client &client, gcc_unused int argc, char *argv[])
 {
 	const char *p = argv[1];
 	bool relative = *p == '+' || *p == '-';
@@ -323,48 +323,48 @@ handle_seekcur(Client *client, gcc_unused int argc, char *argv[])
 		return COMMAND_RETURN_ERROR;
 
 	enum playlist_result result =
-		client->partition.SeekCurrent(seek_time, relative);
+		client.partition.SeekCurrent(seek_time, relative);
 	return print_playlist_result(client, result);
 }
 
 enum command_return
-handle_crossfade(Client *client, gcc_unused int argc, char *argv[])
+handle_crossfade(Client &client, gcc_unused int argc, char *argv[])
 {
 	unsigned xfade_time;
 
 	if (!check_unsigned(client, &xfade_time, argv[1]))
 		return COMMAND_RETURN_ERROR;
-	client->player_control->SetCrossFade(xfade_time);
+	client.player_control.SetCrossFade(xfade_time);
 
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_mixrampdb(Client *client, gcc_unused int argc, char *argv[])
+handle_mixrampdb(Client &client, gcc_unused int argc, char *argv[])
 {
 	float db;
 
 	if (!check_float(client, &db, argv[1]))
 		return COMMAND_RETURN_ERROR;
-	client->player_control->SetMixRampDb(db);
+	client.player_control.SetMixRampDb(db);
 
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_mixrampdelay(Client *client, gcc_unused int argc, char *argv[])
+handle_mixrampdelay(Client &client, gcc_unused int argc, char *argv[])
 {
 	float delay_secs;
 
 	if (!check_float(client, &delay_secs, argv[1]))
 		return COMMAND_RETURN_ERROR;
-	client->player_control->SetMixRampDelay(delay_secs);
+	client.player_control.SetMixRampDelay(delay_secs);
 
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_replay_gain_mode(Client *client,
+handle_replay_gain_mode(Client &client,
 			gcc_unused int argc, char *argv[])
 {
 	if (!replay_gain_set_mode_string(argv[1])) {
@@ -373,13 +373,13 @@ handle_replay_gain_mode(Client *client,
 		return COMMAND_RETURN_ERROR;
 	}
 
-	audio_output_all_set_replay_gain_mode(replay_gain_get_real_mode(client->playlist.queue.random));
+	audio_output_all_set_replay_gain_mode(replay_gain_get_real_mode(client.playlist.queue.random));
 
 	return COMMAND_RETURN_OK;
 }
 
 enum command_return
-handle_replay_gain_status(Client *client,
+handle_replay_gain_status(Client &client,
 			  gcc_unused int argc, gcc_unused char *argv[])
 {
 	client_printf(client, "replay_gain_mode: %s\n",