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

client_new: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-01-03 03:07:16 +01:00
parent a2297558ff
commit b25cce464a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -256,7 +256,7 @@ src_mpd_SOURCES = \
src/client_idle.h \ src/client_idle.h \
src/client_idle.c \ src/client_idle.c \
src/client_list.c \ src/client_list.c \
src/client_new.c \ src/ClientNew.cxx \
src/client_process.c \ src/client_process.c \
src/client_read.c \ src/client_read.c \
src/client_write.c \ src/client_write.c \

10
src/client_new.c → src/ClientNew.cxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2011 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,11 +18,15 @@
*/ */
#include "config.h" #include "config.h"
extern "C" {
#include "client_internal.h" #include "client_internal.h"
}
#include "fd_util.h" #include "fd_util.h"
extern "C" {
#include "fifo_buffer.h" #include "fifo_buffer.h"
#include "resolver.h" #include "resolver.h"
#include "permission.h" #include "permission.h"
}
#include "glib_socket.h" #include "glib_socket.h"
#include <assert.h> #include <assert.h>
@ -99,7 +103,7 @@ client_new(struct player_control *player_control,
g_io_channel_set_buffered(client->channel, false); g_io_channel_set_buffered(client->channel, false);
client->source_id = g_io_add_watch(client->channel, client->source_id = g_io_add_watch(client->channel,
G_IO_IN|G_IO_ERR|G_IO_HUP, GIOCondition(G_IO_IN|G_IO_ERR|G_IO_HUP),
client_in_event, client); client_in_event, client);
client->input = fifo_buffer_new(4096); client->input = fifo_buffer_new(4096);
@ -136,7 +140,7 @@ client_new(struct player_control *player_control,
static void static void
deferred_buffer_free(gpointer data, G_GNUC_UNUSED gpointer user_data) deferred_buffer_free(gpointer data, G_GNUC_UNUSED gpointer user_data)
{ {
struct deferred_buffer *buffer = data; struct deferred_buffer *buffer = (struct deferred_buffer *)data;
g_free(buffer); g_free(buffer);
} }