Split pull part of VirtViewerDisplay out into VirtViewerSession

To facilitate introduction of multi-head support, pull some of
the VirtViewerDisplay class out into a new VirtViewerSession
class.

1 files changed, 11 insertions, 8 deletions

diff --git a/src/virt-viewer-display-spice.h b/src/virt-viewer-display-spice.h
index 6a835ff..23d75cc 100644
--- a/src/virt-viewer-display-spice.h
+++ b/src/virt-viewer-display-spice.h
@@ -49,21 +49,24 @@ G_BEGIN_DECLS
 #define VIRT_VIEWER_DISPLAY_SPICE_GET_CLASS(obj)			\
 	(G_TYPE_INSTANCE_GET_CLASS ((obj), VIRT_VIEWER_TYPE_DISPLAY_SPICE, VirtViewerDisplaySpiceClass))
 
-typedef struct {
+typedef struct _VirtViewerDisplaySpice VirtViewerDisplaySpice;
+typedef struct _VirtViewerDisplaySpiceClass VirtViewerDisplaySpiceClass;
+typedef struct _VirtViewerDisplaySpicePrivate VirtViewerDisplaySpicePrivate;
+
+struct _VirtViewerDisplaySpice {
 	VirtViewerDisplay parent;
 
-	SpiceSession *session;
-	SpiceDisplay *display;
-	SpiceAudio *audio;
-} VirtViewerDisplaySpice;
+	VirtViewerDisplaySpicePrivate *priv;
+};
 
-typedef struct {
+struct _VirtViewerDisplaySpiceClass {
 	VirtViewerDisplayClass parent_class;
-} VirtViewerDisplaySpiceClass;
+};
 
 GType virt_viewer_display_spice_get_type(void);
 
-GtkWidget* virt_viewer_display_spice_new(void);
+GtkWidget* virt_viewer_display_spice_new(SpiceChannel *channel,
+					 SpiceDisplay *display);
 
 G_END_DECLS