Permalink
Browse files

output: moved connection specific code to coutput.c

    
Make output.c without internal.h.
  • Loading branch information...
1 parent aceaa48 commit 983222f1a4c6ef87568d3213c0f8c91858a056ff @MaxKellermann MaxKellermann committed Sep 10, 2009
Showing with 72 additions and 42 deletions.
  1. +1 −0 Makefile.am
  2. +70 −0 src/coutput.c
  3. +1 −42 src/output.c
View
@@ -44,6 +44,7 @@ src_libmpdclient_la_SOURCES = \
src/cpos.c \
src/directory.c \
src/output.c \
+ src/coutput.c \
src/entity.c \
src/idle.c \
src/iso8601.h \
View
@@ -0,0 +1,70 @@
+/* libmpdclient
+ (c) 2003-2009 The Music Player Daemon Project
+ This project's homepage is: http://www.musicpd.org
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <mpd/output.h>
+#include <mpd/send.h>
+#include <mpd/recv.h>
+#include "internal.h"
+
+bool
+mpd_send_outputs(struct mpd_connection *connection)
+{
+ return mpd_send_command(connection, "outputs", NULL);
+}
+
+struct mpd_output *
+mpd_recv_output(struct mpd_connection *connection)
+{
+ struct mpd_output *output;
+ struct mpd_pair *pair;
+
+ pair = mpd_recv_pair_named(connection, "outputid");
+ if (pair == NULL)
+ return NULL;
+
+ output = mpd_output_begin(pair);
+ mpd_return_pair(connection, pair);
+ if (output == NULL) {
+ mpd_error_code(&connection->error, MPD_ERROR_OOM);
+ return NULL;
+ }
+
+ while ((pair = mpd_recv_pair(connection)) != NULL &&
+ mpd_output_feed(output, pair))
+ mpd_return_pair(connection, pair);
+
+ if (mpd_error_is_defined(&connection->error)) {
+ assert(pair == NULL);
+
+ mpd_output_free(output);
+ return NULL;
+ }
+
+ mpd_enqueue_pair(connection, pair);
+ return output;
+}
View
@@ -31,10 +31,7 @@
*/
#include <mpd/output.h>
-#include <mpd/connection.h>
-#include <mpd/send.h>
-#include <mpd/recv.h>
-#include "internal.h"
+#include <mpd/pair.h>
#include <assert.h>
#include <string.h>
@@ -46,12 +43,6 @@ struct mpd_output {
bool enabled;
};
-bool
-mpd_send_outputs(struct mpd_connection *connection)
-{
- return mpd_send_command(connection, "outputs", NULL);
-}
-
struct mpd_output *
mpd_output_begin(const struct mpd_pair *pair)
{
@@ -91,38 +82,6 @@ mpd_output_feed(struct mpd_output *output, const struct mpd_pair *pair)
return true;
}
-struct mpd_output *
-mpd_recv_output(struct mpd_connection *connection)
-{
- struct mpd_output *output;
- struct mpd_pair *pair;
-
- pair = mpd_recv_pair_named(connection, "outputid");
- if (pair == NULL)
- return NULL;
-
- output = mpd_output_begin(pair);
- mpd_return_pair(connection, pair);
- if (output == NULL) {
- mpd_error_code(&connection->error, MPD_ERROR_OOM);
- return NULL;
- }
-
- while ((pair = mpd_recv_pair(connection)) != NULL &&
- mpd_output_feed(output, pair))
- mpd_return_pair(connection, pair);
-
- if (mpd_error_is_defined(&connection->error)) {
- assert(pair == NULL);
-
- mpd_output_free(output);
- return NULL;
- }
-
- mpd_enqueue_pair(connection, pair);
- return output;
-}
-
void
mpd_output_free(struct mpd_output *output)
{

0 comments on commit 983222f

Please sign in to comment.