1.1 --- a/gmyth-upnp/src/gmyth_upnp.h	Thu Jun 14 20:40:47 2007 +0100
     1.2 +++ b/gmyth-upnp/src/gmyth_upnp.h	Mon Feb 04 18:23:49 2008 +0000
     1.3 @@ -35,7 +35,6 @@
     1.4  #include <stdio.h>
     1.5  #include <string.h>
     1.6  
     1.7 -#include <cybergarage/upnp/cupnp.h>
     1.8  #include <gmyth/gmyth_backendinfo.h>
     1.9  
    1.10  G_BEGIN_DECLS
    1.11 @@ -47,7 +46,7 @@
    1.12  #define GMYTH_UPNP_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_UPNP_TYPE, GMythUPnPClass))
    1.13  typedef struct _GMythUPnP GMythUPnP;
    1.14  typedef struct _GMythUPnPClass GMythUPnPClass;
    1.15 -typedef struct _GMythUPnPPrivate GMythUPnPPrivate;
    1.16 +typedef struct _GMythUPnPDevice GMythUPnPDevice;
    1.17  
    1.18  /****************************************
    1.19  * Data Type
    1.20 @@ -59,59 +58,25 @@
    1.21      GMYTH_UPNP_DEVICE_REMOVED
    1.22  } GMythUPnPDeviceStatus;
    1.23  
    1.24 -typedef void    (*GMythUPnPDeviceListener) (GMythUPnP * gmyth_upnp,
    1.25 -                                            GMythUPnPDeviceStatus status,
    1.26 -                                            gchar * dev);
    1.27 +struct _GMythUPnPDevice {
    1.28 +    gchar  *uri;
    1.29 +    gchar  *host;
    1.30 +    gint   port;
    1.31 +    gchar  *protocol;
    1.32 +};
    1.33 +
    1.34  
    1.35  struct _GMythUPnPClass {
    1.36      GObjectClass    parent_class;
    1.37 -
    1.38 -    /*
    1.39 -     * callbacks 
    1.40 -     */
    1.41 -    guint           device_found_handler_signal_id;
    1.42 -
    1.43 -    GMythUPnPDeviceListener device_found_handler;
    1.44 -
    1.45 -    /*
    1.46 -     * no one for now 
    1.47 -     */
    1.48  };
    1.49  
    1.50 -struct _GMythUPnPDevice {
    1.51 -    gchar          *uri;
    1.52 -    gchar          *host;
    1.53 -    gint            port;
    1.54 -    gchar          *protocol;
    1.55 +struct _GMythUPnP {
    1.56 +    GObject         parent;
    1.57  };
    1.58  
    1.59 -typedef struct _GMythUPnPDevice GMythUPnPDevice;
    1.60 -
    1.61 -struct _GMythUPnP {
    1.62 -
    1.63 -    GObject         parent;
    1.64 -    GMythUPnPPrivate *priv;
    1.65 -
    1.66 -
    1.67 -    CgUpnpControlPoint *control_point;
    1.68 -
    1.69 -    gchar          *udn;
    1.70 -
    1.71 -    GMythBackendInfo *backend_info;
    1.72 -
    1.73 -    gboolean        upnp_dev_found;
    1.74 -};
    1.75 -
    1.76 -GType           gmyth_upnp_get_type(void);
    1.77 -GMythUPnP      *gmyth_upnp_new(GMythBackendInfo * gmyth_backend_info,
    1.78 -                               GMythUPnPDeviceListener handler);
    1.79 -
    1.80 -GList          *gmyth_upnp_do_search_sync(GMythUPnP * gmyth_upnp);
    1.81 -
    1.82 -GMythBackendInfo *gmyth_upnp_get_backend_info(GMythUPnP * gmyth_upnp);
    1.83 -
    1.84 -gchar          *gmyth_upnp_device_status_to_string(GMythUPnPDeviceStatus
    1.85 -                                                   status);
    1.86 +GType               gmyth_upnp_get_type         (void);
    1.87 +GMythUPnP*          gmyth_upnp_get_instance     (void);
    1.88 +void                gmyth_upnp_search           (GMythUPnP * gmyth_upnp);
    1.89  
    1.90  G_END_DECLS
    1.91  #endif                          /* _GMYTH_UPNP_H_ */