[Spice-commits] 4 commits - gtk/.gitignore gtk/Makefile.am gtk/smartcard-manager.c gtk/smartcard-manager.h gtk/spice-client-gtk.defs gtk/spice-gstaudio.c gtk/spice-gstaudio.h gtk/spice-pulse.c gtk/spice-pulse.h
Hans de Goede
jwrdegoede at kemper.freedesktop.org
Wed Aug 31 01:28:22 PDT 2011
gtk/.gitignore | 52 ---
gtk/Makefile.am | 8
gtk/smartcard-manager.c | 10
gtk/smartcard-manager.h | 4
gtk/spice-client-gtk.defs | 758 ----------------------------------------------
gtk/spice-gstaudio.c | 78 ++--
gtk/spice-gstaudio.h | 20 -
gtk/spice-pulse.c | 56 +--
gtk/spice-pulse.h | 4
9 files changed, 90 insertions(+), 900 deletions(-)
New commits:
commit 9fbad9a2f0e65f7ef35e96819d6a428a3a1209e8
Author: Hans de Goede <hdegoede at redhat.com>
Date: Tue Aug 30 17:14:25 2011 +0200
Remove spice-client-gtk.defs from git (as it is auto-generated)
spice-client-gtk.defs gets autogenerated (but only when building for
gtk2). Having it in git means having to keep it in sync with the public
API manually, which requires doing a gtk2 build before committing each
time one makes changes to the public API.
As with any autogenerated files, this really does not belong in git,
removing it from git removes the need for the manual syncing.
Also add it to make clean, and change gtk/Makefile.am so that
the contents on EXTRA_DIST don't depend on how ./configure was run
making "make dist"-s result depend on ./configure flags is not a good idea.
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c69d124..74a45dc 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -16,6 +16,9 @@ EXTRA_DIST = \
continuation.h continuation.c \
map-file \
gusb/README.txt \
+ spice-client-gtk.override \
+ spice-client-gtk-manual.defs \
+ spice-client-gtk-module.c \
$(NULL)
bin_PROGRAMS = spicy snappy spicy-stats
@@ -491,10 +494,7 @@ spice-client-gtk-module.defs.c: spice-client-gtk.override spice-client-gtk.defs
tmp.defs > $@
@rm tmp.defs
-CLEANFILES += spice-client-gtk-module.defs.c
-EXTRA_DIST += spice-client-gtk.override spice-client-gtk-manual.defs spice-client-gtk.defs
-else
-EXTRA_DIST += spice-client-gtk.override spice-client-gtk-module.c spice-client-gtk-manual.defs
+CLEANFILES += spice-client-gtk-module.defs.c spice-client-gtk.defs
endif
-include $(INTROSPECTION_MAKEFILE)
diff --git a/gtk/spice-client-gtk.defs b/gtk/spice-client-gtk.defs
deleted file mode 100644
index e585393..0000000
--- a/gtk/spice-client-gtk.defs
+++ /dev/null
@@ -1,758 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Audio
- (in-module "Spice")
- (parent "GObject")
- (c-name "SpiceAudio")
- (gtype-id "SPICE_TYPE_AUDIO")
-)
-
-(define-object Channel
- (in-module "Spice")
- (parent "GObject")
- (c-name "SpiceChannel")
- (gtype-id "SPICE_TYPE_CHANNEL")
-)
-
-(define-object CursorChannel
- (in-module "Spice")
- (parent "SpiceChannel")
- (c-name "SpiceCursorChannel")
- (gtype-id "SPICE_TYPE_CURSOR_CHANNEL")
-)
-
-(define-object Display
- (in-module "Spice")
- (parent "GtkDrawingArea")
- (c-name "SpiceDisplay")
- (gtype-id "SPICE_TYPE_DISPLAY")
-)
-
-(define-object DisplayChannel
- (in-module "Spice")
- (parent "SpiceChannel")
- (c-name "SpiceDisplayChannel")
- (gtype-id "SPICE_TYPE_DISPLAY_CHANNEL")
-)
-
-(define-object InputsChannel
- (in-module "Spice")
- (parent "SpiceChannel")
- (c-name "SpiceInputsChannel")
- (gtype-id "SPICE_TYPE_INPUTS_CHANNEL")
-)
-
-(define-object MainChannel
- (in-module "Spice")
- (parent "SpiceChannel")
- (c-name "SpiceMainChannel")
- (gtype-id "SPICE_TYPE_MAIN_CHANNEL")
-)
-
-(define-object PlaybackChannel
- (in-module "Spice")
- (parent "SpiceChannel")
- (c-name "SpicePlaybackChannel")
- (gtype-id "SPICE_TYPE_PLAYBACK_CHANNEL")
-)
-
-(define-object RecordChannel
- (in-module "Spice")
- (parent "SpiceChannel")
- (c-name "SpiceRecordChannel")
- (gtype-id "SPICE_TYPE_RECORD_CHANNEL")
-)
-
-(define-object Session
- (in-module "Spice")
- (parent "GObject")
- (c-name "SpiceSession")
- (gtype-id "SPICE_TYPE_SESSION")
-)
-
-(define-object SmartcardChannel
- (in-module "Spice")
- (parent "SpiceChannel")
- (c-name "SpiceSmartcardChannel")
- (gtype-id "SPICE_TYPE_SMARTCARD_CHANNEL")
-)
-
-(define-object UsbDeviceManager
- (in-module "Spice")
- (parent "GObject")
- (c-name "SpiceUsbDeviceManager")
- (gtype-id "SPICE_TYPE_USB_DEVICE_MANAGER")
-)
-
-(define-object UsbredirChannel
- (in-module "Spice")
- (parent "SpiceChannel")
- (c-name "SpiceUsbredirChannel")
- (gtype-id "SPICE_TYPE_USBREDIR_CHANNEL")
-)
-
-;; Enumerations and flags ...
-
-(define-enum DisplayKeyEvent
- (in-module "Spice")
- (c-name "SpiceDisplayKeyEvent")
- (gtype-id "SPICE_TYPE_DISPLAY_KEY_EVENT")
- (values
- '("press" "SPICE_DISPLAY_KEY_EVENT_PRESS")
- '("release" "SPICE_DISPLAY_KEY_EVENT_RELEASE")
- '("click" "SPICE_DISPLAY_KEY_EVENT_CLICK")
- )
-)
-
-(define-flags SessionVerify
- (in-module "Spice")
- (c-name "SpiceSessionVerify")
- (gtype-id "SPICE_TYPE_SESSION_VERIFY")
- (values
- '("pubkey" "SPICE_SESSION_VERIFY_PUBKEY")
- '("hostname" "SPICE_SESSION_VERIFY_HOSTNAME")
- '("subject" "SPICE_SESSION_VERIFY_SUBJECT")
- )
-)
-
-(define-enum SessionMigration
- (in-module "Spice")
- (c-name "SpiceSessionMigration")
- (gtype-id "SPICE_TYPE_SESSION_MIGRATION")
- (values
- '("none" "SPICE_SESSION_MIGRATION_NONE")
- '("switching" "SPICE_SESSION_MIGRATION_SWITCHING")
- '("migrating" "SPICE_SESSION_MIGRATION_MIGRATING")
- )
-)
-
-(define-enum ChannelEvent
- (in-module "Spice")
- (c-name "SpiceChannelEvent")
- (gtype-id "SPICE_TYPE_CHANNEL_EVENT")
- (values
- '("none" "SPICE_CHANNEL_NONE")
- '("opened" "SPICE_CHANNEL_OPENED")
- '("switching" "SPICE_CHANNEL_SWITCHING")
- '("closed" "SPICE_CHANNEL_CLOSED")
- '("error-connect" "SPICE_CHANNEL_ERROR_CONNECT")
- '("error-tls" "SPICE_CHANNEL_ERROR_TLS")
- '("error-link" "SPICE_CHANNEL_ERROR_LINK")
- '("error-auth" "SPICE_CHANNEL_ERROR_AUTH")
- '("error-io" "SPICE_CHANNEL_ERROR_IO")
- )
-)
-
-(define-flags InputsLock
- (in-module "Spice")
- (c-name "SpiceInputsLock")
- (gtype-id "SPICE_TYPE_INPUTS_LOCK")
- (values
- '("scroll-lock" "SPICE_INPUTS_SCROLL_LOCK")
- '("num-lock" "SPICE_INPUTS_NUM_LOCK")
- '("caps-lock" "SPICE_INPUTS_CAPS_LOCK")
- )
-)
-
-
-;; From spice-widget.h
-
-(define-function spice_display_get_type
- (c-name "spice_display_get_type")
- (return-type "GType")
-)
-
-(define-function spice_display_new
- (c-name "spice_display_new")
- (is-constructor-of "SpiceDisplay")
- (return-type "SpiceDisplay*")
- (parameters
- '("SpiceSession*" "session")
- '("int" "id")
- )
-)
-
-(define-method mouse_ungrab
- (of-object "SpiceDisplay")
- (c-name "spice_display_mouse_ungrab")
- (return-type "none")
-)
-
-(define-method copy_to_guest
- (of-object "SpiceDisplay")
- (c-name "spice_display_copy_to_guest")
- (return-type "none")
-)
-
-(define-method paste_from_guest
- (of-object "SpiceDisplay")
- (c-name "spice_display_paste_from_guest")
- (return-type "none")
-)
-
-(define-method set_grab_keys
- (of-object "SpiceDisplay")
- (c-name "spice_display_set_grab_keys")
- (return-type "none")
- (parameters
- '("SpiceGrabSequence*" "seq")
- )
-)
-
-(define-method get_grab_keys
- (of-object "SpiceDisplay")
- (c-name "spice_display_get_grab_keys")
- (return-type "SpiceGrabSequence*")
-)
-
-(define-method send_keys
- (of-object "SpiceDisplay")
- (c-name "spice_display_send_keys")
- (return-type "none")
- (parameters
- '("const-guint*" "keyvals")
- '("int" "nkeyvals")
- '("SpiceDisplayKeyEvent" "kind")
- )
-)
-
-(define-method get_pixbuf
- (of-object "SpiceDisplay")
- (c-name "spice_display_get_pixbuf")
- (return-type "GdkPixbuf*")
-)
-
-
-
-;; From spice-widget-enums.h
-
-(define-function spice_display_key_event_get_type
- (c-name "spice_display_key_event_get_type")
- (return-type "GType")
-)
-
-
-
-;; From spice-grabsequence.h
-
-(define-function spice_grab_sequence_get_type
- (c-name "spice_grab_sequence_get_type")
- (return-type "GType")
-)
-
-(define-function spice_grab_sequence_new
- (c-name "spice_grab_sequence_new")
- (is-constructor-of "SpiceGrabSequence")
- (return-type "SpiceGrabSequence*")
- (parameters
- '("guint" "nkeysyms")
- '("guint*" "keysyms")
- )
-)
-
-(define-function spice_grab_sequence_new_from_string
- (c-name "spice_grab_sequence_new_from_string")
- (return-type "SpiceGrabSequence*")
- (parameters
- '("const-gchar*" "str")
- )
-)
-
-(define-method copy
- (of-object "SpiceGrabSequence")
- (c-name "spice_grab_sequence_copy")
- (return-type "SpiceGrabSequence*")
-)
-
-(define-method free
- (of-object "SpiceGrabSequence")
- (c-name "spice_grab_sequence_free")
- (return-type "none")
-)
-
-(define-method as_string
- (of-object "SpiceGrabSequence")
- (c-name "spice_grab_sequence_as_string")
- (return-type "gchar*")
-)
-
-
-
-;; From spice-audio.h
-
-(define-function spice_audio_get_type
- (c-name "spice_audio_get_type")
- (return-type "GType")
-)
-
-(define-function spice_audio_new
- (c-name "spice_audio_new")
- (is-constructor-of "SpiceAudio")
- (return-type "SpiceAudio*")
- (parameters
- '("SpiceSession*" "session")
- '("GMainContext*" "context")
- '("const-char*" "name")
- )
-)
-
-
-
-;; From spice-client.h
-
-(define-function spice_client_error_quark
- (c-name "spice_client_error_quark")
- (return-type "GQuark")
-)
-
-
-
-;; From spice-types.h
-
-
-
-;; From spice-session.h
-
-(define-function spice_session_get_type
- (c-name "spice_session_get_type")
- (return-type "GType")
-)
-
-(define-function spice_session_new
- (c-name "spice_session_new")
- (is-constructor-of "SpiceSession")
- (return-type "SpiceSession*")
-)
-
-(define-method connect
- (of-object "SpiceSession")
- (c-name "spice_session_connect")
- (return-type "gboolean")
-)
-
-(define-method open_fd
- (of-object "SpiceSession")
- (c-name "spice_session_open_fd")
- (return-type "gboolean")
- (parameters
- '("int" "fd")
- )
-)
-
-(define-method disconnect
- (of-object "SpiceSession")
- (c-name "spice_session_disconnect")
- (return-type "none")
-)
-
-(define-method get_channels
- (of-object "SpiceSession")
- (c-name "spice_session_get_channels")
- (return-type "GList*")
-)
-
-(define-method has_channel_type
- (of-object "SpiceSession")
- (c-name "spice_session_has_channel_type")
- (return-type "gboolean")
- (parameters
- '("gint" "type")
- )
-)
-
-
-
-;; From spice-channel.h
-
-(define-function spice_channel_get_type
- (c-name "spice_channel_get_type")
- (return-type "GType")
-)
-
-(define-function spice_channel_new
- (c-name "spice_channel_new")
- (is-constructor-of "SpiceChannel")
- (return-type "SpiceChannel*")
- (parameters
- '("SpiceSession*" "s")
- '("int" "type")
- '("int" "id")
- )
-)
-
-(define-method destroy
- (of-object "SpiceChannel")
- (c-name "spice_channel_destroy")
- (return-type "none")
-)
-
-(define-method connect
- (of-object "SpiceChannel")
- (c-name "spice_channel_connect")
- (return-type "gboolean")
-)
-
-(define-method open_fd
- (of-object "SpiceChannel")
- (c-name "spice_channel_open_fd")
- (return-type "gboolean")
- (parameters
- '("int" "fd")
- )
-)
-
-(define-method disconnect
- (of-object "SpiceChannel")
- (c-name "spice_channel_disconnect")
- (return-type "none")
- (parameters
- '("SpiceChannelEvent" "reason")
- )
-)
-
-(define-method test_capability
- (of-object "SpiceChannel")
- (c-name "spice_channel_test_capability")
- (return-type "gboolean")
- (parameters
- '("guint32" "cap")
- )
-)
-
-(define-method test_common_capability
- (of-object "SpiceChannel")
- (c-name "spice_channel_test_common_capability")
- (return-type "gboolean")
- (parameters
- '("guint32" "cap")
- )
-)
-
-(define-method set_capability
- (of-object "SpiceChannel")
- (c-name "spice_channel_set_capability")
- (return-type "none")
- (parameters
- '("guint32" "cap")
- )
-)
-
-(define-function spice_channel_type_to_string
- (c-name "spice_channel_type_to_string")
- (return-type "const-gchar*")
- (parameters
- '("gint" "type")
- )
-)
-
-
-
-;; From spice-glib-enums.h
-
-(define-function spice_channel_event_get_type
- (c-name "spice_channel_event_get_type")
- (return-type "GType")
-)
-
-(define-function spice_inputs_lock_get_type
- (c-name "spice_inputs_lock_get_type")
- (return-type "GType")
-)
-
-(define-function spice_session_verify_get_type
- (c-name "spice_session_verify_get_type")
- (return-type "GType")
-)
-
-(define-function spice_session_migration_get_type
- (c-name "spice_session_migration_get_type")
- (return-type "GType")
-)
-
-
-
-;; From spice-util.h
-
-(define-function spice_util_set_debug
- (c-name "spice_util_set_debug")
- (return-type "none")
- (parameters
- '("gboolean" "enabled")
- )
-)
-
-(define-function spice_util_get_debug
- (c-name "spice_util_get_debug")
- (return-type "gboolean")
-)
-
-(define-function spice_util_get_version_string
- (c-name "spice_util_get_version_string")
- (return-type "const-gchar*")
-)
-
-
-
-;; From spice-option.h
-
-(define-function spice_get_option_group
- (c-name "spice_get_option_group")
- (return-type "GOptionGroup*")
-)
-
-(define-function spice_set_session_option
- (c-name "spice_set_session_option")
- (return-type "none")
- (parameters
- '("SpiceSession*" "session")
- )
-)
-
-
-
-;; From channel-cursor.h
-
-(define-function spice_cursor_channel_get_type
- (c-name "spice_cursor_channel_get_type")
- (return-type "GType")
-)
-
-
-
-;; From channel-display.h
-
-(define-function spice_display_channel_get_type
- (c-name "spice_display_channel_get_type")
- (return-type "GType")
-)
-
-
-
-;; From channel-inputs.h
-
-(define-function spice_inputs_channel_get_type
- (c-name "spice_inputs_channel_get_type")
- (return-type "GType")
-)
-
-
-
-;; From channel-main.h
-
-(define-function spice_main_channel_get_type
- (c-name "spice_main_channel_get_type")
- (return-type "GType")
-)
-
-(define-function spice_main_set_display_enabled
- (c-name "spice_main_set_display_enabled")
- (return-type "none")
- (parameters
- '("SpiceMainChannel*" "channel")
- '("int" "id")
- '("gboolean" "enabled")
- )
-)
-
-(define-function spice_main_send_monitor_config
- (c-name "spice_main_send_monitor_config")
- (return-type "gboolean")
- (parameters
- '("SpiceMainChannel*" "channel")
- )
-)
-
-(define-function spice_main_clipboard_notify
- (c-name "spice_main_clipboard_notify")
- (return-type "none")
- (parameters
- '("SpiceMainChannel*" "channel")
- '("guint32" "type")
- '("const-guchar*" "data")
- '("size_t" "size")
- )
-)
-
-(define-function spice_main_clipboard_request
- (c-name "spice_main_clipboard_request")
- (return-type "none")
- (parameters
- '("SpiceMainChannel*" "channel")
- '("guint32" "type")
- )
-)
-
-(define-function spice_main_clipboard_selection_grab
- (c-name "spice_main_clipboard_selection_grab")
- (return-type "none")
- (parameters
- '("SpiceMainChannel*" "channel")
- '("guint" "selection")
- '("guint32*" "types")
- '("int" "ntypes")
- )
-)
-
-(define-function spice_main_clipboard_selection_release
- (c-name "spice_main_clipboard_selection_release")
- (return-type "none")
- (parameters
- '("SpiceMainChannel*" "channel")
- '("guint" "selection")
- )
-)
-
-(define-function spice_main_clipboard_selection_notify
- (c-name "spice_main_clipboard_selection_notify")
- (return-type "none")
- (parameters
- '("SpiceMainChannel*" "channel")
- '("guint" "selection")
- '("guint32" "type")
- '("const-guchar*" "data")
- '("size_t" "size")
- )
-)
-
-(define-function spice_main_clipboard_selection_request
- (c-name "spice_main_clipboard_selection_request")
- (return-type "none")
- (parameters
- '("SpiceMainChannel*" "channel")
- '("guint" "selection")
- '("guint32" "type")
- )
-)
-
-
-
-;; From channel-playback.h
-
-(define-function spice_playback_channel_get_type
- (c-name "spice_playback_channel_get_type")
- (return-type "GType")
-)
-
-(define-method set_delay
- (of-object "SpicePlaybackChannel")
- (c-name "spice_playback_channel_set_delay")
- (return-type "none")
- (parameters
- '("guint32" "delay_ms")
- )
-)
-
-
-
-;; From channel-record.h
-
-(define-function spice_record_channel_get_type
- (c-name "spice_record_channel_get_type")
- (return-type "GType")
-)
-
-(define-function spice_record_send_data
- (c-name "spice_record_send_data")
- (return-type "none")
- (parameters
- '("SpiceRecordChannel*" "channel")
- '("gpointer" "data")
- '("gsize" "bytes")
- '("guint32" "time")
- )
-)
-
-
-
-;; From channel-smartcard.h
-
-(define-function spice_smartcard_channel_get_type
- (c-name "spice_smartcard_channel_get_type")
- (return-type "GType")
-)
-
-
-
-;; From channel-usbredir.h
-
-(define-function spice_usbredir_channel_get_type
- (c-name "spice_usbredir_channel_get_type")
- (return-type "GType")
-)
-
-
-
-;; From usb-device-manager.h
-
-(define-function spice_usb_device_get_type
- (c-name "spice_usb_device_get_type")
- (return-type "GType")
-)
-
-(define-function spice_usb_device_manager_get_type
- (c-name "spice_usb_device_manager_get_type")
- (return-type "GType")
-)
-
-(define-function spice_usb_device_manager_get
- (c-name "spice_usb_device_manager_get")
- (return-type "SpiceUsbDeviceManager*")
- (parameters
- '("GMainContext*" "main_context")
- '("GError**" "err")
- )
-)
-
-(define-method register_channel
- (of-object "SpiceUsbDeviceManager")
- (c-name "spice_usb_device_manager_register_channel")
- (return-type "none")
- (parameters
- '("SpiceUsbredirChannel*" "channel")
- )
-)
-
-(define-method unregister_channel
- (of-object "SpiceUsbDeviceManager")
- (c-name "spice_usb_device_manager_unregister_channel")
- (return-type "none")
- (parameters
- '("SpiceUsbredirChannel*" "channel")
- )
-)
-
-(define-method get_devices
- (of-object "SpiceUsbDeviceManager")
- (c-name "spice_usb_device_manager_get_devices")
- (return-type "GPtrArray*")
-)
-
-(define-method is_device_connected
- (of-object "SpiceUsbDeviceManager")
- (c-name "spice_usb_device_manager_is_device_connected")
- (return-type "gboolean")
- (parameters
- '("SpiceUsbDevice*" "device")
- )
-)
-
-(define-method connect_device
- (of-object "SpiceUsbDeviceManager")
- (c-name "spice_usb_device_manager_connect_device")
- (return-type "gboolean")
- (parameters
- '("SpiceUsbDevice*" "device")
- '("GError**" "err")
- )
-)
-
-(define-method disconnect_device
- (of-object "SpiceUsbDeviceManager")
- (c-name "spice_usb_device_manager_disconnect_device")
- (return-type "none")
- (parameters
- '("SpiceUsbDevice*" "device")
- )
-)
-
-
commit 9b09927ffced778da9ea1d1437d66d0ff3466421
Author: Hans de Goede <hdegoede at redhat.com>
Date: Tue Aug 30 16:54:46 2011 +0200
Remove gtk/.gitignore
gtk/.gitignore gets autogenerated and thus should not be part of git.
It currently being part of git is esp. annoying since depending on
wether you're building for gtk2 or gtk3, lines like:
/SpiceClientGtk-2.0.gir
/SpiceClientGtk-2.0.typelib
/libspice-client-gtk-2.0.la
Keep disappearing from it, leading to these changes accidentally
getting included into whatever commit your working on.
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
diff --git a/gtk/.gitignore b/gtk/.gitignore
deleted file mode 100644
index f070332..0000000
--- a/gtk/.gitignore
+++ /dev/null
@@ -1,52 +0,0 @@
-/*.bak
-/*.lo
-/*.o
-/*.orig
-/*.rej
-/*.tab.c
-/*~
-/.*.sw[nop]
-/.deps
-/.gitignore
-/.libs
-/GPATH
-/GRTAGS
-/GSYMS
-/GTAGS
-/ID
-/Makefile
-/Makefile.in
-/SpiceClientGLib-2.0.gir
-/SpiceClientGLib-2.0.typelib
-/SpiceClientGtk-3.0.gir
-/SpiceClientGtk-3.0.typelib
-/SpiceClientGtk-2.0.gir
-/SpiceClientGtk-2.0.typelib
-/SpiceClientGtk.la
-/TAGS
-/_libs
-/generated_demarshallers.c
-/generated_demarshallers1.c
-/generated_marshallers.c
-/generated_marshallers1.c
-/libspice-client-glib-2.0.la
-/libspice-client-gtk-2.0.la
-/libspice-client-gtk-3.0.la
-/snappy
-/so_locations
-/spice-client-gtk-module.defs.c
-/spice-glib-enums.c
-/spice-glib-enums.h
-/spice-marshal.c
-/spice-marshal.h
-/spice-widget-enums.c
-/spice-widget-enums.h
-/spicy
-/spicy-stats
-/tags
-/vncdisplaykeymap_osx2xtkbd.c
-/vncdisplaykeymap_win322xtkbd.c
-/vncdisplaykeymap_xorgevdev2xtkbd.c
-/vncdisplaykeymap_xorgkbd2xtkbd.c
-/vncdisplaykeymap_xorgxquartz2xtkbd.c
-/vncdisplaykeymap_xorgxwin2xtkbd.c
commit 2015af7fe66d6ace254e06020b08e3f4a5613995
Author: Hans de Goede <hdegoede at redhat.com>
Date: Tue Aug 30 16:52:03 2011 +0200
spice_gstaudio: s/SpiceGstAudio/SpiceGstaudio
We should either have SpiceGstAudio && spice_gst_audio or
SpiceGstaudio && spice_gstaudio, not SpiceGstAudio && spice_gstaudio
like we have today. This patch fixes this by replacing SpiceGstAudio
with SpiceGstaudio. We can do this since this is only used internally.
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
diff --git a/gtk/spice-gstaudio.c b/gtk/spice-gstaudio.c
index d8580e7..2e1c8b6 100644
--- a/gtk/spice-gstaudio.c
+++ b/gtk/spice-gstaudio.c
@@ -32,7 +32,7 @@
#define SPICE_GSTAUDIO_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE((obj), SPICE_TYPE_GSTAUDIO, SpiceGstaudioPrivate))
-G_DEFINE_TYPE(SpiceGstAudio, spice_gstaudio, SPICE_TYPE_AUDIO)
+G_DEFINE_TYPE(SpiceGstaudio, spice_gstaudio, SPICE_TYPE_AUDIO)
struct stream {
GstElement *pipe;
@@ -102,7 +102,7 @@ static void spice_gstaudio_dispose(GObject *obj)
}
}
-static void spice_gstaudio_init(SpiceGstAudio *pulse)
+static void spice_gstaudio_init(SpiceGstaudio *pulse)
{
SpiceGstaudioPrivate *p;
@@ -110,7 +110,7 @@ static void spice_gstaudio_init(SpiceGstAudio *pulse)
memset(p, 0, sizeof(*p));
}
-static void spice_gstaudio_class_init(SpiceGstAudioClass *klass)
+static void spice_gstaudio_class_init(SpiceGstaudioClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
@@ -122,7 +122,7 @@ static void spice_gstaudio_class_init(SpiceGstAudioClass *klass)
static void record_new_buffer(GstAppSink *appsink, gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
SpiceGstaudioPrivate *p = gstaudio->priv;
GstMessage *msg;
@@ -134,7 +134,7 @@ static void record_new_buffer(GstAppSink *appsink, gpointer data)
static void record_stop(SpiceRecordChannel *channel, gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
SpiceGstaudioPrivate *p = gstaudio->priv;
SPICE_DEBUG("%s", __FUNCTION__);
@@ -144,7 +144,7 @@ static void record_stop(SpiceRecordChannel *channel, gpointer data)
static gboolean record_bus_cb(GstBus *bus, GstMessage *msg, gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
SpiceGstaudioPrivate *p = gstaudio->priv;
g_return_val_if_fail(p != NULL, FALSE);
@@ -176,7 +176,7 @@ static gboolean record_bus_cb(GstBus *bus, GstMessage *msg, gpointer data)
static void record_start(SpiceRecordChannel *channel, gint format, gint channels,
gint frequency, gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
SpiceGstaudioPrivate *p = gstaudio->priv;
g_return_if_fail(p != NULL);
@@ -232,7 +232,7 @@ lerr:
static void channel_event(SpiceChannel *channel, SpiceChannelEvent event,
gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
SpiceGstaudioPrivate *p = gstaudio->priv;
switch (event) {
@@ -256,7 +256,7 @@ static void channel_event(SpiceChannel *channel, SpiceChannelEvent event,
static void playback_stop(SpicePlaybackChannel *channel, gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
SpiceGstaudioPrivate *p = SPICE_GSTAUDIO_GET_PRIVATE(gstaudio);
if (p->playback.pipe)
@@ -269,7 +269,7 @@ static void playback_stop(SpicePlaybackChannel *channel, gpointer data)
static gboolean update_mmtime_timeout_cb(gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
SpiceGstaudioPrivate *p = SPICE_GSTAUDIO_GET_PRIVATE(gstaudio);
GstQuery *q;
@@ -288,7 +288,7 @@ static gboolean update_mmtime_timeout_cb(gpointer data)
static void playback_start(SpicePlaybackChannel *channel, gint format, gint channels,
gint frequency, gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
SpiceGstaudioPrivate *p = SPICE_GSTAUDIO_GET_PRIVATE(gstaudio);
g_return_if_fail(p != NULL);
@@ -341,7 +341,7 @@ static void playback_data(SpicePlaybackChannel *channel,
gpointer *audio, gint size,
gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
SpiceGstaudioPrivate *p = SPICE_GSTAUDIO_GET_PRIVATE(gstaudio);
GstBuffer *buf;
@@ -356,7 +356,7 @@ static void playback_data(SpicePlaybackChannel *channel,
static void playback_volume_changed(GObject *object, GParamSpec *pspec, gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
GstElement *e;
guint16 *volume;
guint nchannels;
@@ -390,7 +390,7 @@ static void playback_volume_changed(GObject *object, GParamSpec *pspec, gpointer
static void playback_mute_changed(GObject *object, GParamSpec *pspec, gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
SpiceGstaudioPrivate *p = gstaudio->priv;
GstElement *e;
gboolean mute;
@@ -414,7 +414,7 @@ static void playback_mute_changed(GObject *object, GParamSpec *pspec, gpointer d
static void record_volume_changed(GObject *object, GParamSpec *pspec, gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
SpiceGstaudioPrivate *p = gstaudio->priv;
GstElement *e;
guint16 *volume;
@@ -451,7 +451,7 @@ static void record_volume_changed(GObject *object, GParamSpec *pspec, gpointer d
static void record_mute_changed(GObject *object, GParamSpec *pspec, gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
SpiceGstaudioPrivate *p = gstaudio->priv;
GstElement *e;
gboolean mute;
@@ -476,7 +476,7 @@ static void record_mute_changed(GObject *object, GParamSpec *pspec, gpointer dat
static void channel_new(SpiceSession *s, SpiceChannel *channel, gpointer data)
{
- SpiceGstAudio *gstaudio = data;
+ SpiceGstaudio *gstaudio = data;
SpiceGstaudioPrivate *p = gstaudio->priv;
if (SPICE_IS_PLAYBACK_CHANNEL(channel)) {
@@ -514,10 +514,10 @@ static void channel_new(SpiceSession *s, SpiceChannel *channel, gpointer data)
}
}
-SpiceGstAudio *spice_gstaudio_new(SpiceSession *session, GMainContext *context,
+SpiceGstaudio *spice_gstaudio_new(SpiceSession *session, GMainContext *context,
const char *name)
{
- SpiceGstAudio *gstaudio;
+ SpiceGstaudio *gstaudio;
SpiceGstaudioPrivate *p;
GList *list;
diff --git a/gtk/spice-gstaudio.h b/gtk/spice-gstaudio.h
index b043f85..b605f1c 100644
--- a/gtk/spice-gstaudio.h
+++ b/gtk/spice-gstaudio.h
@@ -24,31 +24,31 @@
G_BEGIN_DECLS
#define SPICE_TYPE_GSTAUDIO (spice_gstaudio_get_type())
-#define SPICE_GSTAUDIO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SPICE_TYPE_GSTAUDIO, SpiceGstAudio))
-#define SPICE_GSTAUDIO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SPICE_TYPE_GSTAUDIO, SpiceGstAudioClass))
+#define SPICE_GSTAUDIO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SPICE_TYPE_GSTAUDIO, SpiceGstaudio))
+#define SPICE_GSTAUDIO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SPICE_TYPE_GSTAUDIO, SpiceGstaudioClass))
#define SPICE_IS_GSTAUDIO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SPICE_TYPE_GSTAUDIO))
#define SPICE_IS_GSTAUDIO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SPICE_TYPE_GSTAUDIO))
-#define SPICE_GSTAUDIO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), SPICE_TYPE_GSTAUDIO, SpiceGstAudioClass))
+#define SPICE_GSTAUDIO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), SPICE_TYPE_GSTAUDIO, SpiceGstaudioClass))
-typedef struct _SpiceGstAudio SpiceGstAudio;
-typedef struct _SpiceGstAudioClass SpiceGstAudioClass;
+typedef struct _SpiceGstaudio SpiceGstaudio;
+typedef struct _SpiceGstaudioClass SpiceGstaudioClass;
typedef struct _SpiceGstaudioPrivate SpiceGstaudioPrivate;
-struct _SpiceGstAudio {
+struct _SpiceGstaudio {
SpiceAudio parent;
SpiceGstaudioPrivate *priv;
/* Do not add fields to this struct */
};
-struct _SpiceGstAudioClass {
+struct _SpiceGstaudioClass {
SpiceAudioClass parent_class;
/* Do not add fields to this struct */
};
GType spice_gstaudio_get_type(void);
-SpiceGstAudio *spice_gstaudio_new(SpiceSession *session,
+SpiceGstaudio *spice_gstaudio_new(SpiceSession *session,
GMainContext *context, const char *name);
G_END_DECLS
commit 5e56a2a5c6c90959a46682244ff7f50506c2920c
Author: Hans de Goede <hdegoede at redhat.com>
Date: Tue Aug 30 16:47:50 2011 +0200
Rename my_foo private datatypes to MyFooPrivate
We were using the gobject standard notation of MyFooPrivate everywhere
except for 3 places, this brings these 3 into sync, with what we do elsewhere.
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
diff --git a/gtk/smartcard-manager.c b/gtk/smartcard-manager.c
index 0ff96b1..a192bd6 100644
--- a/gtk/smartcard-manager.c
+++ b/gtk/smartcard-manager.c
@@ -50,9 +50,9 @@
/* gobject glue */
#define SPICE_SMARTCARD_MANAGER_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), SPICE_TYPE_SMARTCARD_MANAGER, spice_smartcard_manager))
+ (G_TYPE_INSTANCE_GET_PRIVATE ((obj), SPICE_TYPE_SMARTCARD_MANAGER, SpiceSmartcardManagerPrivate))
-struct spice_smartcard_manager {
+struct _SpiceSmartcardManagerPrivate {
guint monitor_id;
/* software smartcard reader, the certificates to use for this reader
@@ -100,7 +100,7 @@ static gboolean smartcard_monitor_dispatch(VEvent *event, gpointer user_data);
static void spice_smartcard_manager_init(SpiceSmartcardManager *smartcard_manager)
{
- spice_smartcard_manager *priv;
+ SpiceSmartcardManagerPrivate *priv;
priv = SPICE_SMARTCARD_MANAGER_GET_PRIVATE(smartcard_manager);
smartcard_manager->priv = priv;
@@ -119,7 +119,7 @@ static void spice_smartcard_manager_dispose(GObject *gobject)
static void spice_smartcard_manager_finalize(GObject *gobject)
{
- spice_smartcard_manager *priv;
+ SpiceSmartcardManagerPrivate *priv;
priv = SPICE_SMARTCARD_MANAGER_GET_PRIVATE(gobject);
if (priv->monitor_id != 0) {
@@ -223,7 +223,7 @@ static void spice_smartcard_manager_class_init(SpiceSmartcardManagerClass *klass
gobject_class->dispose = spice_smartcard_manager_dispose;
gobject_class->finalize = spice_smartcard_manager_finalize;
- g_type_class_add_private(klass, sizeof(spice_smartcard_manager));
+ g_type_class_add_private(klass, sizeof(SpiceSmartcardManagerPrivate));
}
/* ------------------------------------------------------------------ */
diff --git a/gtk/smartcard-manager.h b/gtk/smartcard-manager.h
index d1f8b88..24d9f92 100644
--- a/gtk/smartcard-manager.h
+++ b/gtk/smartcard-manager.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
typedef struct _SpiceSmartcardManager SpiceSmartcardManager;
typedef struct _SpiceSmartcardManagerClass SpiceSmartcardManagerClass;
-typedef struct spice_smartcard_manager spice_smartcard_manager;
+typedef struct _SpiceSmartcardManagerPrivate SpiceSmartcardManagerPrivate;
typedef struct _SpiceSmartcardReader SpiceSmartcardReader;
struct _SpiceSmartcardManager
@@ -43,7 +43,7 @@ struct _SpiceSmartcardManager
GObject parent;
/*< private >*/
- spice_smartcard_manager *priv;
+ SpiceSmartcardManagerPrivate *priv;
/* Do not add fields to this struct */
};
diff --git a/gtk/spice-gstaudio.c b/gtk/spice-gstaudio.c
index c1ff979..d8580e7 100644
--- a/gtk/spice-gstaudio.c
+++ b/gtk/spice-gstaudio.c
@@ -30,7 +30,7 @@
#include "spice-session.h"
#define SPICE_GSTAUDIO_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE((obj), SPICE_TYPE_GSTAUDIO, spice_gstaudio))
+ (G_TYPE_INSTANCE_GET_PRIVATE((obj), SPICE_TYPE_GSTAUDIO, SpiceGstaudioPrivate))
G_DEFINE_TYPE(SpiceGstAudio, spice_gstaudio, SPICE_TYPE_AUDIO)
@@ -42,7 +42,7 @@ struct stream {
guint channels;
};
-struct spice_gstaudio {
+struct _SpiceGstaudioPrivate {
SpiceSession *session;
SpiceChannel *pchannel;
SpiceChannel *rchannel;
@@ -80,7 +80,7 @@ void stream_dispose(struct stream *s)
static void spice_gstaudio_dispose(GObject *obj)
{
- spice_gstaudio *p;
+ SpiceGstaudioPrivate *p;
SPICE_DEBUG("%s", __FUNCTION__);
p = SPICE_GSTAUDIO_GET_PRIVATE(obj);
@@ -104,7 +104,7 @@ static void spice_gstaudio_dispose(GObject *obj)
static void spice_gstaudio_init(SpiceGstAudio *pulse)
{
- spice_gstaudio *p;
+ SpiceGstaudioPrivate *p;
p = pulse->priv = SPICE_GSTAUDIO_GET_PRIVATE(pulse);
memset(p, 0, sizeof(*p));
@@ -117,13 +117,13 @@ static void spice_gstaudio_class_init(SpiceGstAudioClass *klass)
gobject_class->finalize = spice_gstaudio_finalize;
gobject_class->dispose = spice_gstaudio_dispose;
- g_type_class_add_private(klass, sizeof(spice_gstaudio));
+ g_type_class_add_private(klass, sizeof(SpiceGstaudioPrivate));
}
static void record_new_buffer(GstAppSink *appsink, gpointer data)
{
SpiceGstAudio *gstaudio = data;
- spice_gstaudio *p = gstaudio->priv;
+ SpiceGstaudioPrivate *p = gstaudio->priv;
GstMessage *msg;
g_return_if_fail(p != NULL);
@@ -135,7 +135,7 @@ static void record_new_buffer(GstAppSink *appsink, gpointer data)
static void record_stop(SpiceRecordChannel *channel, gpointer data)
{
SpiceGstAudio *gstaudio = data;
- spice_gstaudio *p = gstaudio->priv;
+ SpiceGstaudioPrivate *p = gstaudio->priv;
SPICE_DEBUG("%s", __FUNCTION__);
if (p->record.pipe)
@@ -145,7 +145,7 @@ static void record_stop(SpiceRecordChannel *channel, gpointer data)
static gboolean record_bus_cb(GstBus *bus, GstMessage *msg, gpointer data)
{
SpiceGstAudio *gstaudio = data;
- spice_gstaudio *p = gstaudio->priv;
+ SpiceGstaudioPrivate *p = gstaudio->priv;
g_return_val_if_fail(p != NULL, FALSE);
@@ -177,7 +177,7 @@ static void record_start(SpiceRecordChannel *channel, gint format, gint channels
gint frequency, gpointer data)
{
SpiceGstAudio *gstaudio = data;
- spice_gstaudio *p = gstaudio->priv;
+ SpiceGstaudioPrivate *p = gstaudio->priv;
g_return_if_fail(p != NULL);
g_return_if_fail(format == SPICE_AUDIO_FMT_S16);
@@ -233,7 +233,7 @@ static void channel_event(SpiceChannel *channel, SpiceChannelEvent event,
gpointer data)
{
SpiceGstAudio *gstaudio = data;
- spice_gstaudio *p = gstaudio->priv;
+ SpiceGstaudioPrivate *p = gstaudio->priv;
switch (event) {
case SPICE_CHANNEL_OPENED:
@@ -257,7 +257,7 @@ static void channel_event(SpiceChannel *channel, SpiceChannelEvent event,
static void playback_stop(SpicePlaybackChannel *channel, gpointer data)
{
SpiceGstAudio *gstaudio = data;
- spice_gstaudio *p = SPICE_GSTAUDIO_GET_PRIVATE(gstaudio);
+ SpiceGstaudioPrivate *p = SPICE_GSTAUDIO_GET_PRIVATE(gstaudio);
if (p->playback.pipe)
gst_element_set_state(p->playback.pipe, GST_STATE_READY);
@@ -270,7 +270,7 @@ static void playback_stop(SpicePlaybackChannel *channel, gpointer data)
static gboolean update_mmtime_timeout_cb(gpointer data)
{
SpiceGstAudio *gstaudio = data;
- spice_gstaudio *p = SPICE_GSTAUDIO_GET_PRIVATE(gstaudio);
+ SpiceGstaudioPrivate *p = SPICE_GSTAUDIO_GET_PRIVATE(gstaudio);
GstQuery *q;
q = gst_query_new_latency();
@@ -289,7 +289,7 @@ static void playback_start(SpicePlaybackChannel *channel, gint format, gint chan
gint frequency, gpointer data)
{
SpiceGstAudio *gstaudio = data;
- spice_gstaudio *p = SPICE_GSTAUDIO_GET_PRIVATE(gstaudio);
+ SpiceGstaudioPrivate *p = SPICE_GSTAUDIO_GET_PRIVATE(gstaudio);
g_return_if_fail(p != NULL);
g_return_if_fail(format == SPICE_AUDIO_FMT_S16);
@@ -342,7 +342,7 @@ static void playback_data(SpicePlaybackChannel *channel,
gpointer data)
{
SpiceGstAudio *gstaudio = data;
- spice_gstaudio *p = SPICE_GSTAUDIO_GET_PRIVATE(gstaudio);
+ SpiceGstaudioPrivate *p = SPICE_GSTAUDIO_GET_PRIVATE(gstaudio);
GstBuffer *buf;
g_return_if_fail(p != NULL);
@@ -360,7 +360,7 @@ static void playback_volume_changed(GObject *object, GParamSpec *pspec, gpointer
GstElement *e;
guint16 *volume;
guint nchannels;
- spice_gstaudio *p = gstaudio->priv;
+ SpiceGstaudioPrivate *p = gstaudio->priv;
gdouble vol;
if (!p->playback.sink)
@@ -391,7 +391,7 @@ static void playback_volume_changed(GObject *object, GParamSpec *pspec, gpointer
static void playback_mute_changed(GObject *object, GParamSpec *pspec, gpointer data)
{
SpiceGstAudio *gstaudio = data;
- spice_gstaudio *p = gstaudio->priv;
+ SpiceGstaudioPrivate *p = gstaudio->priv;
GstElement *e;
gboolean mute;
@@ -415,7 +415,7 @@ static void playback_mute_changed(GObject *object, GParamSpec *pspec, gpointer d
static void record_volume_changed(GObject *object, GParamSpec *pspec, gpointer data)
{
SpiceGstAudio *gstaudio = data;
- spice_gstaudio *p = gstaudio->priv;
+ SpiceGstaudioPrivate *p = gstaudio->priv;
GstElement *e;
guint16 *volume;
guint nchannels;
@@ -452,7 +452,7 @@ static void record_volume_changed(GObject *object, GParamSpec *pspec, gpointer d
static void record_mute_changed(GObject *object, GParamSpec *pspec, gpointer data)
{
SpiceGstAudio *gstaudio = data;
- spice_gstaudio *p = gstaudio->priv;
+ SpiceGstaudioPrivate *p = gstaudio->priv;
GstElement *e;
gboolean mute;
@@ -477,7 +477,7 @@ static void record_mute_changed(GObject *object, GParamSpec *pspec, gpointer dat
static void channel_new(SpiceSession *s, SpiceChannel *channel, gpointer data)
{
SpiceGstAudio *gstaudio = data;
- spice_gstaudio *p = gstaudio->priv;
+ SpiceGstaudioPrivate *p = gstaudio->priv;
if (SPICE_IS_PLAYBACK_CHANNEL(channel)) {
g_return_if_fail(p->pchannel == NULL);
@@ -518,7 +518,7 @@ SpiceGstAudio *spice_gstaudio_new(SpiceSession *session, GMainContext *context,
const char *name)
{
SpiceGstAudio *gstaudio;
- spice_gstaudio *p;
+ SpiceGstaudioPrivate *p;
GList *list;
gst_init(NULL, NULL);
diff --git a/gtk/spice-gstaudio.h b/gtk/spice-gstaudio.h
index ba2b71a..b043f85 100644
--- a/gtk/spice-gstaudio.h
+++ b/gtk/spice-gstaudio.h
@@ -33,11 +33,11 @@ G_BEGIN_DECLS
typedef struct _SpiceGstAudio SpiceGstAudio;
typedef struct _SpiceGstAudioClass SpiceGstAudioClass;
-typedef struct spice_gstaudio spice_gstaudio;
+typedef struct _SpiceGstaudioPrivate SpiceGstaudioPrivate;
struct _SpiceGstAudio {
SpiceAudio parent;
- spice_gstaudio *priv;
+ SpiceGstaudioPrivate *priv;
/* Do not add fields to this struct */
};
diff --git a/gtk/spice-pulse.c b/gtk/spice-pulse.c
index 5c9fd4c..dce4e9c 100644
--- a/gtk/spice-pulse.c
+++ b/gtk/spice-pulse.c
@@ -24,7 +24,7 @@
#include <pulse/pulseaudio.h>
#define SPICE_PULSE_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE((obj), SPICE_TYPE_PULSE, spice_pulse))
+ (G_TYPE_INSTANCE_GET_PRIVATE((obj), SPICE_TYPE_PULSE, SpicePulsePrivate))
struct stream {
pa_sample_spec spec;
@@ -35,7 +35,7 @@ struct stream {
gboolean started;
};
-struct spice_pulse {
+struct _SpicePulsePrivate {
SpiceSession *session;
SpiceChannel *pchannel;
SpiceChannel *rchannel;
@@ -77,7 +77,7 @@ static void channel_new(SpiceSession *s, SpiceChannel *channel,
static void spice_pulse_finalize(GObject *obj)
{
- spice_pulse *p;
+ SpicePulsePrivate *p;
p = SPICE_PULSE_GET_PRIVATE(obj);
@@ -92,7 +92,7 @@ static void spice_pulse_finalize(GObject *obj)
static void spice_pulse_dispose(GObject *obj)
{
- spice_pulse *p;
+ SpicePulsePrivate *p;
SPICE_DEBUG("%s", __FUNCTION__);
p = SPICE_PULSE_GET_PRIVATE(obj);
@@ -139,7 +139,7 @@ static void spice_pulse_dispose(GObject *obj)
static void spice_pulse_init(SpicePulse *pulse)
{
- spice_pulse *p;
+ SpicePulsePrivate *p;
p = pulse->priv = SPICE_PULSE_GET_PRIVATE(pulse);
memset(p, 0, sizeof(*p));
@@ -152,7 +152,7 @@ static void spice_pulse_class_init(SpicePulseClass *klass)
gobject_class->finalize = spice_pulse_finalize;
gobject_class->dispose = spice_pulse_dispose;
- g_type_class_add_private(klass, sizeof(spice_pulse));
+ g_type_class_add_private(klass, sizeof(SpicePulsePrivate));
}
/* ------------------------------------------------------------------ */
@@ -169,7 +169,7 @@ static void pulse_uncork_cb(pa_stream *pastream, int success, void *data)
static void stream_uncork(SpicePulse *pulse, struct stream *s)
{
- spice_pulse *p = SPICE_PULSE_GET_PRIVATE(pulse);
+ SpicePulsePrivate *p = SPICE_PULSE_GET_PRIVATE(pulse);
pa_operation *o = NULL;
if (s->cork_op) {
@@ -214,7 +214,7 @@ static void pulse_cork_cb(pa_stream *pastream, int success, void *data)
static void stream_cork(SpicePulse *pulse, struct stream *s)
{
- spice_pulse *p = SPICE_PULSE_GET_PRIVATE(pulse);
+ SpicePulsePrivate *p = SPICE_PULSE_GET_PRIVATE(pulse);
pa_operation *o = NULL;
if (s->uncork_op) {
@@ -234,7 +234,7 @@ static void stream_cork(SpicePulse *pulse, struct stream *s)
static void stream_stop(SpicePulse *pulse, struct stream *s)
{
- spice_pulse *p = SPICE_PULSE_GET_PRIVATE(pulse);
+ SpicePulsePrivate *p = SPICE_PULSE_GET_PRIVATE(pulse);
if (pa_stream_disconnect(s->stream) < 0) {
g_warning("pa_stream_disconnect() failed: %s",
@@ -246,7 +246,7 @@ static void stream_stop(SpicePulse *pulse, struct stream *s)
static void stream_state_callback(pa_stream *s, void *userdata)
{
- spice_pulse *p;
+ SpicePulsePrivate *p;
p = SPICE_PULSE_GET_PRIVATE(userdata);
g_return_if_fail(p != NULL);
@@ -285,7 +285,7 @@ static void stream_underflow_cb(pa_stream *s, void *userdata)
static void create_playback(SpicePulse *pulse)
{
- spice_pulse *p = SPICE_PULSE_GET_PRIVATE(pulse);
+ SpicePulsePrivate *p = SPICE_PULSE_GET_PRIVATE(pulse);
pa_stream_flags_t flags;
pa_buffer_attr buffer_attr = { 0, };
@@ -318,7 +318,7 @@ static void playback_start(SpicePlaybackChannel *channel, gint format, gint chan
gint frequency, gpointer data)
{
SpicePulse *pulse = data;
- spice_pulse *p = SPICE_PULSE_GET_PRIVATE(pulse);
+ SpicePulsePrivate *p = SPICE_PULSE_GET_PRIVATE(pulse);
pa_context_state_t state;
g_return_if_fail(p != NULL);
@@ -362,7 +362,7 @@ static void playback_data(SpicePlaybackChannel *channel,
gpointer data)
{
SpicePulse *pulse = data;
- spice_pulse *p = SPICE_PULSE_GET_PRIVATE(pulse);
+ SpicePulsePrivate *p = SPICE_PULSE_GET_PRIVATE(pulse);
pa_stream_state_t state;
if (!p->playback.stream)
@@ -395,7 +395,7 @@ static void playback_data(SpicePlaybackChannel *channel,
static void playback_stop(SpicePlaybackChannel *channel, gpointer data)
{
SpicePulse *pulse = data;
- spice_pulse *p = pulse->priv;
+ SpicePulsePrivate *p = pulse->priv;
SPICE_DEBUG("%s", __FUNCTION__);
@@ -410,7 +410,7 @@ static void stream_update_timing_callback(pa_stream *s, int success, void *userd
{
pa_usec_t usec;
int negative = 0;
- spice_pulse *p;
+ SpicePulsePrivate *p;
p = SPICE_PULSE_GET_PRIVATE(userdata);
@@ -434,7 +434,7 @@ static void stream_update_timing_callback(pa_stream *s, int success, void *userd
static void playback_get_delay(SpicePlaybackChannel *channel, gpointer data)
{
SpicePulse *pulse = data;
- spice_pulse *p = pulse->priv;
+ SpicePulsePrivate *p = pulse->priv;
if (p->playback.stream && pa_stream_get_state(p->playback.stream) == PA_STREAM_READY) {
pa_operation *o;
@@ -449,7 +449,7 @@ static void playback_get_delay(SpicePlaybackChannel *channel, gpointer data)
static void stream_read_callback(pa_stream *s, size_t length, void *data)
{
SpicePulse *pulse = data;
- spice_pulse *p = SPICE_PULSE_GET_PRIVATE(pulse);
+ SpicePulsePrivate *p = SPICE_PULSE_GET_PRIVATE(pulse);
g_return_if_fail(p != NULL);
@@ -481,7 +481,7 @@ static void stream_read_callback(pa_stream *s, size_t length, void *data)
static void create_record(SpicePulse *pulse)
{
- spice_pulse *p = SPICE_PULSE_GET_PRIVATE(pulse);
+ SpicePulsePrivate *p = SPICE_PULSE_GET_PRIVATE(pulse);
pa_buffer_attr buffer_attr = { 0, };
pa_stream_flags_t flags;
@@ -513,7 +513,7 @@ static void record_start(SpiceRecordChannel *channel, gint format, gint channels
gint frequency, gpointer data)
{
SpicePulse *pulse = data;
- spice_pulse *p = SPICE_PULSE_GET_PRIVATE(pulse);
+ SpicePulsePrivate *p = SPICE_PULSE_GET_PRIVATE(pulse);
pa_context_state_t state;
p->record.started = TRUE;
@@ -553,7 +553,7 @@ static void record_start(SpiceRecordChannel *channel, gint format, gint channels
static void record_stop(SpiceRecordChannel *channel, gpointer data)
{
SpicePulse *pulse = data;
- spice_pulse *p = pulse->priv;
+ SpicePulsePrivate *p = pulse->priv;
SPICE_DEBUG("%s", __FUNCTION__);
@@ -568,7 +568,7 @@ static void channel_event(SpiceChannel *channel, SpiceChannelEvent event,
gpointer data)
{
SpicePulse *pulse = data;
- spice_pulse *p = pulse->priv;
+ SpicePulsePrivate *p = pulse->priv;
switch (event) {
case SPICE_CHANNEL_OPENED:
@@ -594,7 +594,7 @@ static void channel_event(SpiceChannel *channel, SpiceChannelEvent event,
static void playback_volume_changed(GObject *object, GParamSpec *pspec, gpointer data)
{
SpicePulse *pulse = data;
- spice_pulse *p = pulse->priv;
+ SpicePulsePrivate *p = pulse->priv;
guint16 *volume;
guint nchannels;
pa_operation *op;
@@ -630,7 +630,7 @@ static void playback_volume_changed(GObject *object, GParamSpec *pspec, gpointer
static void playback_mute_changed(GObject *object, GParamSpec *pspec, gpointer data)
{
SpicePulse *pulse = data;
- spice_pulse *p = pulse->priv;
+ SpicePulsePrivate *p = pulse->priv;
gboolean mute;
pa_operation *op;
@@ -654,7 +654,7 @@ static void playback_mute_changed(GObject *object, GParamSpec *pspec, gpointer d
static void record_mute_changed(GObject *object, GParamSpec *pspec, gpointer data)
{
SpicePulse *pulse = data;
- spice_pulse *p = pulse->priv;
+ SpicePulsePrivate *p = pulse->priv;
gboolean mute;
pa_operation *op;
@@ -678,7 +678,7 @@ static void record_mute_changed(GObject *object, GParamSpec *pspec, gpointer dat
static void record_volume_changed(GObject *object, GParamSpec *pspec, gpointer data)
{
SpicePulse *pulse = data;
- spice_pulse *p = pulse->priv;
+ SpicePulsePrivate *p = pulse->priv;
guint16 *volume;
guint nchannels;
pa_operation *op;
@@ -715,7 +715,7 @@ static void record_volume_changed(GObject *object, GParamSpec *pspec, gpointer d
static void channel_new(SpiceSession *s, SpiceChannel *channel, gpointer data)
{
SpicePulse *pulse = data;
- spice_pulse *p = pulse->priv;
+ SpicePulsePrivate *p = pulse->priv;
if (SPICE_IS_PLAYBACK_CHANNEL(channel)) {
g_return_if_fail(p->pchannel == NULL);
@@ -756,7 +756,7 @@ static void channel_new(SpiceSession *s, SpiceChannel *channel, gpointer data)
static void context_state_callback(pa_context *c, void *userdata)
{
- spice_pulse *p;
+ SpicePulsePrivate *p;
p = SPICE_PULSE_GET_PRIVATE(userdata);
g_return_if_fail(p != NULL);
@@ -793,7 +793,7 @@ SpicePulse *spice_pulse_new(SpiceSession *session, GMainContext *context,
const char *name)
{
SpicePulse *pulse;
- spice_pulse *p;
+ SpicePulsePrivate *p;
GList *list, *tmp;
pulse = g_object_new(SPICE_TYPE_PULSE, NULL);
diff --git a/gtk/spice-pulse.h b/gtk/spice-pulse.h
index 0e484a9..819647e 100644
--- a/gtk/spice-pulse.h
+++ b/gtk/spice-pulse.h
@@ -33,11 +33,11 @@ G_BEGIN_DECLS
typedef struct _SpicePulse SpicePulse;
typedef struct _SpicePulseClass SpicePulseClass;
-typedef struct spice_pulse spice_pulse;
+typedef struct _SpicePulsePrivate SpicePulsePrivate;
struct _SpicePulse {
SpiceAudio parent;
- spice_pulse *priv;
+ SpicePulsePrivate *priv;
/* Do not add fields to this struct */
};
More information about the Spice-commits
mailing list