1.1 --- a/gmyth-upnp/src/gmyth_upnp.h	Mon Feb 25 14:12:27 2008 +0000
     1.2 +++ b/gmyth-upnp/src/gmyth_upnp.h	Fri Mar 14 13:14:54 2008 +0000
     1.3 @@ -32,40 +32,16 @@
     1.4  #include <glib.h>
     1.5  #include <glib-object.h>
     1.6  
     1.7 -#include <stdlib.h>
     1.8 -#include <stdio.h>
     1.9 -#include <string.h>
    1.10 +G_BEGIN_DECLS
    1.11 +#define GMYTH_UPNP_TYPE                 (gmyth_upnp_get_type ())
    1.12 +#define GMYTH_UPNP(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE, GMythUPnP))
    1.13 +#define GMYTH_UPNP_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE, GMythUPnPClass))
    1.14 +#define IS_GMYTH_UPNP(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE))
    1.15 +#define IS_GMYTH_UPNP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE))
    1.16 +#define GMYTH_UPNP_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_UPNP_TYPE, GMythUPnPClass))
    1.17  
    1.18 -#include <gmyth/gmyth_backendinfo.h>
    1.19 -
    1.20 -G_BEGIN_DECLS
    1.21 -#define GMYTH_UPNP_TYPE               (gmyth_upnp_get_type ())
    1.22 -#define GMYTH_UPNP(obj)          		 	(G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE, GMythUPnP))
    1.23 -#define GMYTH_UPNP_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE, GMythUPnPClass))
    1.24 -#define IS_GMYTH_UPNP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE))
    1.25 -#define IS_GMYTH_UPNP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE))
    1.26 -#define GMYTH_UPNP_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_UPNP_TYPE, GMythUPnPClass))
    1.27  typedef struct _GMythUPnP GMythUPnP;
    1.28  typedef struct _GMythUPnPClass GMythUPnPClass;
    1.29 -typedef struct _GMythUPnPDevice GMythUPnPDevice;
    1.30 -
    1.31 -/****************************************
    1.32 -* Data Type
    1.33 -****************************************/
    1.34 -
    1.35 -typedef enum upnp_device_list_status {
    1.36 -    GMYTH_UPNP_DEVICE_ADDED = 0,
    1.37 -    GMYTH_UPNP_DEVICE_UPDATED,
    1.38 -    GMYTH_UPNP_DEVICE_REMOVED
    1.39 -} GMythUPnPDeviceStatus;
    1.40 -
    1.41 -struct _GMythUPnPDevice {
    1.42 -    gchar  *uri;
    1.43 -    gchar  *host;
    1.44 -    gint   port;
    1.45 -    gchar  *protocol;
    1.46 -};
    1.47 -
    1.48  
    1.49  struct _GMythUPnPClass {
    1.50      GObjectClass    parent_class;