1.1 --- a/gmyth-upnp/src/gmyth_upnp.h	Thu May 24 01:26:10 2007 +0100
     1.2 +++ b/gmyth-upnp/src/gmyth_upnp.h	Tue Jul 17 23:17:09 2007 +0100
     1.3 @@ -39,76 +39,79 @@
     1.4  #include <gmyth/gmyth_backendinfo.h>
     1.5  
     1.6  G_BEGIN_DECLS
     1.7 -
     1.8  #define GMYTH_UPNP_TYPE               (gmyth_upnp_get_type ())
     1.9  #define GMYTH_UPNP(obj)          		 	(G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE, GMythUPnP))
    1.10  #define GMYTH_UPNP_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE, GMythUPnPClass))
    1.11  #define IS_GMYTH_UPNP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE))
    1.12  #define IS_GMYTH_UPNP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE))
    1.13  #define GMYTH_UPNP_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_UPNP_TYPE, GMythUPnPClass))
    1.14 -
    1.15 -typedef struct _GMythUPnP         GMythUPnP;
    1.16 -typedef struct _GMythUPnPClass    GMythUPnPClass;
    1.17 -typedef struct _GMythUPnPPrivate  GMythUPnPPrivate;
    1.18 +typedef struct _GMythUPnP GMythUPnP;
    1.19 +typedef struct _GMythUPnPClass GMythUPnPClass;
    1.20 +typedef struct _GMythUPnPPrivate GMythUPnPPrivate;
    1.21  
    1.22  /****************************************
    1.23  * Data Type
    1.24  ****************************************/
    1.25  
    1.26  typedef enum upnp_device_list_status {
    1.27 -	GMYTH_UPNP_DEVICE_ADDED = 0,
    1.28 -	GMYTH_UPNP_DEVICE_UPDATED,
    1.29 -	GMYTH_UPNP_DEVICE_REMOVED
    1.30 +    GMYTH_UPNP_DEVICE_ADDED = 0,
    1.31 +    GMYTH_UPNP_DEVICE_UPDATED,
    1.32 +    GMYTH_UPNP_DEVICE_REMOVED
    1.33  } GMythUPnPDeviceStatus;
    1.34  
    1.35 -typedef void (*GMythUPnPDeviceListener) ( GMythUPnP *gmyth_upnp, GMythUPnPDeviceStatus status, gchar *dev );
    1.36 +typedef void    (*GMythUPnPDeviceListener) (GMythUPnP * gmyth_upnp,
    1.37 +                                            GMythUPnPDeviceStatus status,
    1.38 +                                            gchar * dev);
    1.39  
    1.40 -struct _GMythUPnPClass
    1.41 -{
    1.42 -	GObjectClass parent_class;
    1.43 +struct _GMythUPnPClass {
    1.44 +    GObjectClass    parent_class;
    1.45  
    1.46 -	/* callbacks */
    1.47 -	guint device_found_handler_signal_id;
    1.48 +    /*
    1.49 +     * callbacks 
    1.50 +     */
    1.51 +    guint           device_found_handler_signal_id;
    1.52  
    1.53 -	GMythUPnPDeviceListener device_found_handler;
    1.54 +    GMythUPnPDeviceListener device_found_handler;
    1.55  
    1.56 -	/* no one for now */
    1.57 +    /*
    1.58 +     * no one for now 
    1.59 +     */
    1.60  };
    1.61  
    1.62  struct _GMythUPnPDevice {
    1.63 -	gchar *uri;
    1.64 -	gchar *host;
    1.65 -	gint port;
    1.66 -	gchar *protocol;
    1.67 +    gchar          *uri;
    1.68 +    gchar          *host;
    1.69 +    gint            port;
    1.70 +    gchar          *protocol;
    1.71  };
    1.72  
    1.73  typedef struct _GMythUPnPDevice GMythUPnPDevice;
    1.74  
    1.75  struct _GMythUPnP {
    1.76 -	
    1.77 -	GObject parent;
    1.78 -	GMythUPnPPrivate *priv;
    1.79 -	
    1.80  
    1.81 -	CgUpnpControlPoint* control_point;
    1.82 -	
    1.83 -	gchar *udn;
    1.84 -	
    1.85 -	GMythBackendInfo *backend_info;
    1.86 +    GObject         parent;
    1.87 +    GMythUPnPPrivate *priv;
    1.88  
    1.89 -	gboolean upnp_dev_found;
    1.90 +
    1.91 +    CgUpnpControlPoint *control_point;
    1.92 +
    1.93 +    gchar          *udn;
    1.94 +
    1.95 +    GMythBackendInfo *backend_info;
    1.96 +
    1.97 +    gboolean        upnp_dev_found;
    1.98  };
    1.99  
   1.100 -GType       			gmyth_upnp_get_type (void);
   1.101 -GMythUPnP *			gmyth_upnp_new ( GMythBackendInfo *gmyth_backend_info, 
   1.102 -						GMythUPnPDeviceListener handler );
   1.103 +GType           gmyth_upnp_get_type(void);
   1.104 +GMythUPnP      *gmyth_upnp_new(GMythBackendInfo * gmyth_backend_info,
   1.105 +                               GMythUPnPDeviceListener handler);
   1.106  
   1.107 -GList *				gmyth_upnp_do_search_sync( GMythUPnP* gmyth_upnp );
   1.108 +GList          *gmyth_upnp_do_search_sync(GMythUPnP * gmyth_upnp);
   1.109  
   1.110 -GMythBackendInfo*		gmyth_upnp_get_backend_info ( GMythUPnP *gmyth_upnp );
   1.111 +GMythBackendInfo *gmyth_upnp_get_backend_info(GMythUPnP * gmyth_upnp);
   1.112  
   1.113 -gchar *				gmyth_upnp_device_status_to_string( GMythUPnPDeviceStatus status );
   1.114 +gchar          *gmyth_upnp_device_status_to_string(GMythUPnPDeviceStatus
   1.115 +                                                   status);
   1.116  
   1.117  G_END_DECLS
   1.118 -
   1.119 -#endif /* _GMYTH_UPNP_H_ */
   1.120 +#endif                          /* _GMYTH_UPNP_H_ */