spice_usb_device_manager_device_error: replace SpiceUsbDevice with libusb_device

Its only user is channel-usbredir, which needs the libusb_device.

In preparations for a different SpiceUsbDevice.
This commit is contained in:
Uri Lublin 2012-07-08 12:40:59 +03:00
parent c1799ead7e
commit 15b4e7890f
3 changed files with 7 additions and 3 deletions

View File

@ -569,7 +569,7 @@ static void do_emit_main_context(GObject *object, int event, gpointer params)
spice_usb_device_manager_device_error(
spice_usb_device_manager_get(
spice_channel_get_session(SPICE_CHANNEL(channel)), NULL),
(SpiceUsbDevice *)p->device, p->error);
p->device, p->error);
}
break;
}

View File

@ -31,8 +31,11 @@ gboolean spice_usb_device_manager_start_event_listening(
void spice_usb_device_manager_stop_event_listening(
SpiceUsbDeviceManager *manager);
#ifdef USE_USBREDIR
#include <libusb.h>
void spice_usb_device_manager_device_error(
SpiceUsbDeviceManager *manager, SpiceUsbDevice *device, GError *err);
SpiceUsbDeviceManager *manager, libusb_device *libdev, GError *err);
#endif
G_END_DECLS

View File

@ -736,8 +736,9 @@ void spice_usb_device_manager_stop_event_listening(
}
void spice_usb_device_manager_device_error(
SpiceUsbDeviceManager *self, SpiceUsbDevice *device, GError *err)
SpiceUsbDeviceManager *self, libusb_device *libdev, GError *err)
{
SpiceUsbDevice *device = (SpiceUsbDevice *)libdev;
g_signal_emit(self, signals[DEVICE_ERROR], 0, device, err);
}
#endif