Commit 1699767e authored by W. Michael Petullo's avatar W. Michael Petullo
Browse files

Fixes related to porting Rhythmbox to API 3


Signed-off-by: W. Michael Petullo's avatarW. Michael Petullo <mike@flyn.org>
parent 910b4f97
......@@ -1125,28 +1125,6 @@ handle_logout (DMAPConnection *connection,
dmap_connection_state_done (connection, TRUE);
}
DMAPConnection *
dmap_connection_new (const char *name,
const char *host,
guint port,
gboolean password_protected,
DMAPDb *db,
DMAPRecordFactory *factory)
{
DMAPConnection *connection;
connection = g_object_new (DMAP_TYPE_CONNECTION,
"name", name,
"password-protected", password_protected,
"db", db,
"host", host,
"port", port,
"factory", factory,
NULL);
return connection;
}
gboolean
dmap_connection_is_connected (DMAPConnection *connection)
{
......
......@@ -146,13 +146,6 @@ typedef void (* DMAPResponseHandler) (DMAPConnection *connection,
GType dmap_connection_get_type (void);
DMAPConnection * dmap_connection_new (const char *name,
const char *host,
guint port,
gboolean password_protected,
DMAPDb *db,
DMAPRecordFactory *factory);
gboolean dmap_connection_is_connected (DMAPConnection *connection);
void dmap_connection_setup (DMAPConnection *connection);
void dmap_connection_connect (DMAPConnection *connection,
......
......@@ -371,12 +371,13 @@ resolve_cb (AvahiServiceResolver *service_resolver,
#endif
DMAPMdnsBrowser *browser)
{
gchar *name = NULL;
gchar *pair = NULL; /* FIXME: extract DACP-specific items into sub-class? See also howl code. */
gchar host[AVAHI_ADDRESS_STR_MAX];
gboolean pp = FALSE;
DMAPMdnsBrowserService *service;
switch (event) {
gchar *name = NULL;
gchar *pair = NULL; /* FIXME: extract DACP-specific items into sub-class? See also howl code. */
gchar host[AVAHI_ADDRESS_STR_MAX];
gboolean pp = FALSE;
DMAPMdnsBrowserService *service;
case AVAHI_RESOLVER_FAILURE:
g_warning ("Failed to resolve service '%s' of type '%s' in domain '%s': %s\n", service_name, type, domain, avahi_strerror(avahi_client_errno(avahi_service_resolver_get_client(service_resolver))));
break;
......
#ifndef __DMAP_H
#define __DMAP_H
#include <libdmapsharing/daap-connection.h>
#include <libdmapsharing/daap-record.h>
#include <libdmapsharing/daap-share.h>
#include <libdmapsharing/dmap-connection.h>
......@@ -14,6 +15,7 @@
#include <libdmapsharing/dmap-record.h>
#include <libdmapsharing/dmap-record-factory.h>
#include <libdmapsharing/dmap-share.h>
#include <libdmapsharing/dpap-connection.h>
#include <libdmapsharing/dpap-record.h>
#include <libdmapsharing/dpap-share.h>
#include <libdmapsharing/dacp-share.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment