Core: Resize events now pass only video dimensions (no video object)

Libvisual · Apr 12, 2012 · edbbe1c · edbbe1c
1 parent 43ba96d
commit edbbe1c
Show file tree

Hide file tree

Showing 27 changed files with 101 additions and 189 deletions.
diff --git a/libvisual-plugins/plugins/actor/blursk/actor_blursk.c b/libvisual-plugins/plugins/actor/blursk/actor_blursk.c
@@ -33,7 +33,7 @@ const VisPluginInfo *get_plugin_info (void);
 static int act_blursk_init (VisPluginData *plugin);
 static int act_blursk_cleanup (VisPluginData *plugin);
 static int act_blursk_requisition (VisPluginData *plugin, int *width, int *height);
-static int act_blursk_dimension (VisPluginData *plugin, VisVideo *video, int width, int height);
+static int act_blursk_resize (VisPluginData *plugin, int width, int height);
 static int act_blursk_events (VisPluginData *plugin, VisEventQueue *events);
 static VisPalette *act_blursk_palette (VisPluginData *plugin);
 static int act_blursk_render (VisPluginData *plugin, VisVideo *video, VisAudio *audio);
@@ -242,17 +242,13 @@ static int act_blursk_requisition (VisPluginData *plugin, int *width, int *heigh
         return 0;
 }
 
-static int act_blursk_dimension (VisPluginData *plugin, VisVideo *video, int width, int height)
+static int act_blursk_resize (VisPluginData *plugin, int width, int height)
 {
         BlurskPrivate *priv = visual_object_get_private (VISUAL_OBJECT (plugin));
 
-        priv->video = video;
-
         priv->width = width;
         priv->height = height;
 
-        video->pitch = width;
-
         config.height = height;
         config.width = width;
 
@@ -276,8 +272,7 @@ static int act_blursk_events (VisPluginData *plugin, VisEventQueue *events) {
         {
 
             case VISUAL_EVENT_RESIZE:
-                act_blursk_dimension (plugin, ev.event.resize.video,
-                    ev.event.resize.width, ev.event.resize.height);
+                act_blursk_resize (plugin, ev.event.resize.width, ev.event.resize.height);
                 size_update = 1;
                 break;
 

diff --git a/libvisual-plugins/plugins/actor/bumpscope/actor_bumpscope.c b/libvisual-plugins/plugins/actor/bumpscope/actor_bumpscope.c
@@ -42,7 +42,7 @@ const VisPluginInfo *get_plugin_info (void);
 static int act_bumpscope_init (VisPluginData *plugin);
 static int act_bumpscope_cleanup (VisPluginData *plugin);
 static int act_bumpscope_requisition (VisPluginData *plugin, int *width, int *height);
-static int act_bumpscope_dimension (VisPluginData *plugin, VisVideo *video, int width, int height);
+static int act_bumpscope_resize (VisPluginData *plugin, int width, int height);
 static int act_bumpscope_events (VisPluginData *plugin, VisEventQueue *events);
 static VisPalette *act_bumpscope_palette (VisPluginData *plugin);
 static int act_bumpscope_render (VisPluginData *plugin, VisVideo *video, VisAudio *audio);
@@ -170,11 +170,11 @@ static int act_bumpscope_requisition (VisPluginData *plugin, int *width, int *he
 	return 0;
 }
 
-static int act_bumpscope_dimension (VisPluginData *plugin, VisVideo *video, int width, int height)
+static int act_bumpscope_resize (VisPluginData *plugin, int width, int height)
 {
 	BumpscopePrivate *priv = visual_object_get_private (VISUAL_OBJECT (plugin));
 
-	priv->width = width;
+	priv->width  = width;
 	priv->height = height;
 
 	__bumpscope_cleanup (priv);
@@ -193,8 +193,7 @@ static int act_bumpscope_events (VisPluginData *plugin, VisEventQueue *events)
 	while (visual_event_queue_poll (events, &ev)) {
 		switch (ev.type) {
 			case VISUAL_EVENT_RESIZE:
-				act_bumpscope_dimension (plugin, ev.event.resize.video,
-						ev.event.resize.width, ev.event.resize.height);
+				act_bumpscope_resize (plugin, ev.event.resize.width, ev.event.resize.height);
 				break;
 
 			case VISUAL_EVENT_MOUSEMOTION:

diff --git a/libvisual-plugins/plugins/actor/bumpscope/bump_scope.c b/libvisual-plugins/plugins/actor/bumpscope/bump_scope.c
@@ -410,8 +410,8 @@ void __bumpscope_render_pcm (BumpscopePrivate *priv, float *data)
 void __bumpscope_init (BumpscopePrivate *priv)
 {
 	priv->phongdat = visual_mem_malloc0 (priv->phongres * priv->phongres * 2);
-	priv->rgb_buf = visual_mem_malloc0 (visual_video_get_size (priv->video) + (priv->video->pitch * 2) + 1);
-	priv->rgb_buf2 = visual_mem_malloc0 (visual_video_get_size (priv->video) + (priv->video->pitch * 2) + 1);
+	priv->rgb_buf  = visual_mem_malloc0 (priv->width*2 * priv->height + 1);
+	priv->rgb_buf2 = visual_mem_malloc0 (priv->width*2 * priv->height + 1);
 
 	__bumpscope_generate_phongdat (priv);
 	bumpscope_generate_intense (priv);

diff --git a/libvisual-plugins/plugins/actor/corona/actor_corona.cpp b/libvisual-plugins/plugins/actor/corona/actor_corona.cpp
@@ -83,7 +83,7 @@ const int PALETTEDATA[][NB_PALETTES] = {
   int lv_corona_init (VisPluginData *plugin);
   int lv_corona_cleanup (VisPluginData *plugin);
   int lv_corona_requisition (VisPluginData *plugin, int *width, int *height);
-  int lv_corona_dimension (VisPluginData *plugin, VisVideo *video, int width, int height);
+  int lv_corona_resize (VisPluginData *plugin, int width, int height);
   int lv_corona_events (VisPluginData *plugin, VisEventQueue *events);
   VisPalette *lv_corona_palette (VisPluginData *plugin);
   int lv_corona_render (VisPluginData *plugin, VisVideo *video, VisAudio *audio);
@@ -183,7 +183,7 @@ int lv_corona_requisition (VisPluginData *plugin, int *width, int *height)
 	return 0;
 }
 
-int lv_corona_dimension (VisPluginData *plugin, VisVideo *video, int width, int height)
+int lv_corona_resize (VisPluginData *plugin, int width, int height)
 {
 	CoronaPrivate *priv = (CoronaPrivate *) visual_object_get_private (VISUAL_OBJECT (plugin));
 
@@ -208,8 +208,7 @@ int lv_corona_events (VisPluginData *plugin, VisEventQueue *events)
 	while (visual_event_queue_poll (events, &ev)) {
 		switch (ev.type) {
 			case VISUAL_EVENT_RESIZE:
-				lv_corona_dimension (plugin, ev.event.resize.video,
-						ev.event.resize.width, ev.event.resize.height);
+				lv_corona_resize (plugin, ev.event.resize.width, ev.event.resize.height);
 
 				break;
 
@@ -237,7 +236,6 @@ int lv_corona_render (VisPluginData *plugin, VisVideo *video, VisAudio *audio)
 	VisBuffer pcmb;
 	float freq[2][256];
 	float pcm[256];
-	VisVideo vidcorona;
 	short freqdata[2][512]; // FIXME Move to floats
 	unsigned long timemilli = 0;
 	int i;
@@ -275,12 +273,12 @@ int lv_corona_render (VisPluginData *plugin, VisVideo *video, VisAudio *audio)
 	priv->corona->update(&priv->tl); // Update Corona
 	priv->pcyl->update(&priv->tl);    // Update Palette Cycler
 
-	visual_video_init (&vidcorona);
-	visual_video_set_depth (&vidcorona, VISUAL_VIDEO_DEPTH_8BIT);
-	visual_video_set_dimension (&vidcorona, video->width, video->height);
-	visual_video_set_buffer (&vidcorona, priv->corona->getSurface());
-
-	visual_video_mirror (video, &vidcorona, VISUAL_VIDEO_MIRROR_Y);
+	VisVideo *vidcorona = visual_video_new ();
+	visual_video_set_depth (vidcorona, VISUAL_VIDEO_DEPTH_8BIT);
+	visual_video_set_dimension (vidcorona, video->width, video->height);
+	visual_video_set_buffer (vidcorona, priv->corona->getSurface());
+	visual_video_mirror (video, vidcorona, VISUAL_VIDEO_MIRROR_Y);
+	visual_object_unref (VISUAL_OBJECT (vidcorona));
 
 	return 0;
 }

diff --git a/libvisual-plugins/plugins/actor/dancingparticles/actor_dancingparticles.cpp b/libvisual-plugins/plugins/actor/dancingparticles/actor_dancingparticles.cpp
@@ -42,7 +42,7 @@ const char *curtitle = "Moeders";
 extern "C" int lv_dancingparticles_init (VisPluginData *plugin);
 extern "C" int lv_dancingparticles_cleanup (VisPluginData *plugin);
 extern "C" int lv_dancingparticles_requisition (VisPluginData *plugin, int *width, int *height);
-extern "C" int lv_dancingparticles_dimension (VisPluginData *plugin, VisVideo *video, int width, int height);
+extern "C" int lv_dancingparticles_resize (VisPluginData *plugin, int width, int height);
 extern "C" int lv_dancingparticles_events (VisPluginData *plugin, VisEventQueue *events);
 extern "C" VisPalette *lv_dancingparticles_palette (VisPluginData *plugin);
 extern "C" int lv_dancingparticles_render (VisPluginData *plugin, VisVideo *video, VisAudio *audio);
@@ -138,7 +138,7 @@ extern "C" int lv_dancingparticles_requisition (VisPluginData *plugin, int *widt
 	return 0;
 }
 
-extern "C" int lv_dancingparticles_dimension (VisPluginData *plugin, VisVideo *video, int width, int height)
+extern "C" int lv_dancingparticles_resize (VisPluginData *plugin, int width, int height)
 {
 	glViewport(0, 0, width, height);
 
@@ -156,8 +156,7 @@ extern "C" int lv_dancingparticles_events (VisPluginData *plugin, VisEventQueue
 	while (visual_event_queue_poll (events, &ev)) {
 		switch (ev.type) {
 			case VISUAL_EVENT_RESIZE:
-				lv_dancingparticles_dimension (plugin, ev.event.resize.video,
-						ev.event.resize.width, ev.event.resize.height);
+				lv_dancingparticles_resize (plugin, ev.event.resize.width, ev.event.resize.height);
 				break;
 
 			case VISUAL_EVENT_PARAM:

diff --git a/libvisual-plugins/plugins/actor/flower/actor_flower.c b/libvisual-plugins/plugins/actor/flower/actor_flower.c
@@ -58,7 +58,7 @@ typedef struct {
 static int lv_flower_init (VisPluginData *plugin);
 static int lv_flower_cleanup (VisPluginData *plugin);
 static int lv_flower_requisition (VisPluginData *plugin, int *width, int *height);
-static int lv_flower_dimension (VisPluginData *plugin, VisVideo *video, int width, int height);
+static int lv_flower_resize (VisPluginData *plugin, int width, int height);
 static int lv_flower_events (VisPluginData *plugin, VisEventQueue *events);
 static VisPalette *lv_flower_palette (VisPluginData *plugin);
 static int lv_flower_render (VisPluginData *plugin, VisVideo *video, VisAudio *audio);
@@ -170,13 +170,11 @@ static int lv_flower_requisition (VisPluginData *plugin, int *width, int *height
 	return 0;
 }
 
-static int lv_flower_dimension (VisPluginData *plugin, VisVideo *video, int width, int height)
+static int lv_flower_resize (VisPluginData *plugin, int width, int height)
 {
 	FlowerPrivate *priv = visual_object_get_private (VISUAL_OBJECT (plugin));
 	GLfloat ratio;
 
-	visual_video_set_dimension (video, width, height);
-
 	ratio = (GLfloat) width / (GLfloat) height;
 
 	glViewport (0, 0, (GLsizei) width, (GLsizei) height);
@@ -201,8 +199,7 @@ static int lv_flower_events (VisPluginData *plugin, VisEventQueue *events)
 	while (visual_event_queue_poll (events, &ev)) {
 		switch (ev.type) {
 			case VISUAL_EVENT_RESIZE:
-				lv_flower_dimension (plugin, ev.event.resize.video,
-						ev.event.resize.width, ev.event.resize.height);
+				lv_flower_resize (plugin, ev.event.resize.width, ev.event.resize.height);
 				break;
 
 			default: /* to avoid warnings */

diff --git a/libvisual-plugins/plugins/actor/gdkpixbuf/actor_gdkpixbuf.c b/libvisual-plugins/plugins/actor/gdkpixbuf/actor_gdkpixbuf.c
@@ -64,7 +64,7 @@ static int update_into_visvideo (PixbufPrivate *priv, GdkPixbuf *src);
 static int act_gdkpixbuf_init (VisPluginData *plugin);
 static int act_gdkpixbuf_cleanup (VisPluginData *plugin);
 static int act_gdkpixbuf_requisition (VisPluginData *plugin, int *width, int *height);
-static int act_gdkpixbuf_dimension (VisPluginData *plugin, VisVideo *video, int width, int height);
+static int act_gdkpixbuf_resize (VisPluginData *plugin, int width, int height);
 static int act_gdkpixbuf_events (VisPluginData *plugin, VisEventQueue *events);
 static VisPalette *act_gdkpixbuf_palette (VisPluginData *plugin);
 static int act_gdkpixbuf_render (VisPluginData *plugin, VisVideo *video, VisAudio *audio);
@@ -171,7 +171,7 @@ static int act_gdkpixbuf_requisition (VisPluginData *plugin, int *width, int *he
 	return 0;
 }
 
-int act_gdkpixbuf_dimension (VisPluginData *plugin, VisVideo *video, int width, int height)
+int act_gdkpixbuf_resize (VisPluginData *plugin, int width, int height)
 {
 	PixbufPrivate *priv = visual_object_get_private (VISUAL_OBJECT (plugin));
 
@@ -199,8 +199,7 @@ static int act_gdkpixbuf_events (VisPluginData *plugin, VisEventQueue *events)
 	while (visual_event_queue_poll (events, &ev)) {
 		switch (ev.type) {
 			case VISUAL_EVENT_RESIZE:
-				act_gdkpixbuf_dimension (plugin, ev.event.resize.video,
-						ev.event.resize.width, ev.event.resize.height);
+				act_gdkpixbuf_resize (plugin, ev.event.resize.width, ev.event.resize.height);
 				break;
 
 			case VISUAL_EVENT_PARAM:

diff --git a/libvisual-plugins/plugins/actor/gforce/unix/libvisual/actor_gforce.cpp b/libvisual-plugins/plugins/actor/gforce/unix/libvisual/actor_gforce.cpp
@@ -63,7 +63,7 @@ typedef struct {
 VISUAL_C_LINKAGE int lv_gforce_init (VisPluginData *plugin);
 VISUAL_C_LINKAGE int lv_gforce_cleanup (VisPluginData *plugin);
 VISUAL_C_LINKAGE int lv_gforce_requisition (VisPluginData *plugin, int *width, int *height);
-VISUAL_C_LINKAGE int lv_gforce_dimension (VisPluginData *plugin, VisVideo *video, int width, int height);
+VISUAL_C_LINKAGE int lv_gforce_resize (VisPluginData *plugin, int width, int height);
 VISUAL_C_LINKAGE int lv_gforce_events (VisPluginData *plugin, VisEventQueue *events);
 VISUAL_C_LINKAGE VisPalette *lv_gforce_palette (VisPluginData *plugin);
 VISUAL_C_LINKAGE int lv_gforce_render (VisPluginData *plugin, VisVideo *video, VisAudio *audio);
@@ -176,7 +176,7 @@ int lv_gforce_requisition (VisPluginData *plugin, int *width, int *height)
 }
 
 VISUAL_C_LINKAGE
-int lv_gforce_dimension (VisPluginData *plugin, VisVideo *video, int width, int height)
+int lv_gforce_resize (VisPluginData *plugin, int width, int height)
 {
 	GForcePrivate *priv = (GForcePrivate *) visual_object_get_private (VISUAL_OBJECT (plugin));
 	Rect r;
@@ -196,8 +196,7 @@ int lv_gforce_events (VisPluginData *plugin, VisEventQueue *events)
 	while (visual_event_queue_poll (events, &ev)) {
 		switch (ev.type) {
 			case VISUAL_EVENT_RESIZE:
-				lv_gforce_dimension (plugin, ev.event.resize.video,
-						ev.event.resize.width, ev.event.resize.height);
+				lv_gforce_resize (plugin, ev.event.resize.width, ev.event.resize.height);
 				break;
 
 			case VISUAL_EVENT_MOUSEMOTION:

diff --git a/libvisual-plugins/plugins/actor/goom2k4/actor_goom2k4.c b/libvisual-plugins/plugins/actor/goom2k4/actor_goom2k4.c
@@ -50,7 +50,7 @@ typedef struct {
 static int lv_goom_init (VisPluginData *plugin);
 static int lv_goom_cleanup (VisPluginData *plugin);
 static int lv_goom_requisition (VisPluginData *plugin, int *width, int *height);
-static int lv_goom_dimension (VisPluginData *plugin, VisVideo *video, int width, int height);
+static int lv_goom_resize (VisPluginData *plugin, int width, int height);
 static int lv_goom_events (VisPluginData *plugin, VisEventQueue *events);
 static VisPalette *lv_goom_palette (VisPluginData *plugin);
 static int lv_goom_render (VisPluginData *plugin, VisVideo *video, VisAudio *audio);
@@ -123,7 +123,7 @@ static int lv_goom_requisition (VisPluginData *plugin, int *width, int *height)
 	return 0;
 }
 
-static int lv_goom_dimension (VisPluginData *plugin, VisVideo *video, int width, int height)
+static int lv_goom_resize (VisPluginData *plugin, int width, int height)
 {
 	GoomPrivate *priv = visual_object_get_private (VISUAL_OBJECT (plugin));
 
@@ -139,9 +139,7 @@ static int lv_goom_events (VisPluginData *plugin, VisEventQueue *events)
 	while (visual_event_queue_poll (events, &ev)) {
 		switch (ev.type) {
 			case VISUAL_EVENT_RESIZE:
-				lv_goom_dimension (plugin, ev.event.resize.video,
-						ev.event.resize.width, ev.event.resize.height);
-
+				lv_goom_resize (plugin, ev.event.resize.width, ev.event.resize.height);
 				break;
 
 			default: /* to avoid warnings */

diff --git a/libvisual-plugins/plugins/actor/gstreamer/actor_gstreamer.c b/libvisual-plugins/plugins/actor/gstreamer/actor_gstreamer.c
@@ -51,7 +51,7 @@ static void have_data (GstElement *sink, GstBuffer *buffer, gpointer data);
 static int act_gstreamer_init (VisPluginData *plugin);
 static int act_gstreamer_cleanup (VisPluginData *plugin);
 static int act_gstreamer_requisition (VisPluginData *plugin, int *width, int *height);
-static int act_gstreamer_dimension (VisPluginData *plugin, VisVideo *video, int width, int height);
+static int act_gstreamer_resize (VisPluginData *plugin, int width, int height);
 static int act_gstreamer_events (VisPluginData *plugin, VisEventQueue *events);
 static VisPalette *act_gstreamer_palette (VisPluginData *plugin);
 static int act_gstreamer_render (VisPluginData *plugin, VisVideo *video, VisAudio *audio);
@@ -115,10 +115,8 @@ static int act_gstreamer_requisition (VisPluginData *plugin, int *width, int *he
 	return 0;
 }
 
-static int act_gstreamer_dimension (VisPluginData *plugin, VisVideo *video, int width, int height)
+static int act_gstreamer_resize (VisPluginData *plugin, int width, int height)
 {
-	visual_video_set_dimension (video, width, height);
-
 	return 0;
 }
 
@@ -129,8 +127,7 @@ static int act_gstreamer_events (VisPluginData *plugin, VisEventQueue *events)
 	while (visual_event_queue_poll (events, &ev)) {
 		switch (ev.type) {
 			case VISUAL_EVENT_RESIZE:
-				act_gstreamer_dimension (plugin, ev.event.resize.video,
-						ev.event.resize.width, ev.event.resize.height);
+				act_gstreamer_resize (plugin, ev.event.resize.width, ev.event.resize.height);
 				break;
 
 

diff --git a/libvisual-plugins/plugins/actor/infinite/lv_infinite.c b/libvisual-plugins/plugins/actor/infinite/lv_infinite.c
@@ -39,7 +39,7 @@ const VisPluginInfo *get_plugin_info (void);
 
 static int act_infinite_init (VisPluginData *plugin);
 static int act_infinite_cleanup (VisPluginData *plugin);
-static int act_infinite_dimension (VisPluginData *plugin, VisVideo *video, int width, int height);
+static int act_infinite_resize (VisPluginData *plugin, int width, int height);
 static int act_infinite_requisition (VisPluginData *plugin, int *width, int *height);
 static int act_infinite_events (VisPluginData *plugin, VisEventQueue *events);
 static VisPalette *act_infinite_palette (VisPluginData *plugin);
@@ -151,24 +151,13 @@ static int act_infinite_requisition (VisPluginData *plugin, int *width, int *hei
 	return 0;
 }
 
-static int act_infinite_dimension (VisPluginData *plugin, VisVideo *video, int width, int height)
+static int act_infinite_resize (VisPluginData *plugin, int width, int height)
 {
-	InfinitePrivate *priv;
-
-	visual_return_val_if_fail (plugin != NULL, -1);
-	visual_return_val_if_fail (video != NULL, -1);
-
-	priv = visual_object_get_private (VISUAL_OBJECT (plugin));
+	InfinitePrivate *priv = visual_object_get_private (VISUAL_OBJECT (plugin));
 	priv->plugwidth = width;
 	priv->plugheight = height;
 
-	visual_video_set_dimension (video, width, height);
-
 	_inf_close_renderer (priv);
-
-	if (video->depth != VISUAL_VIDEO_DEPTH_8BIT)
-		return -1;
-
 	_inf_init_renderer (priv);
 
 	return 0;
@@ -181,8 +170,7 @@ static int act_infinite_events (VisPluginData *plugin, VisEventQueue *events)
 	while (visual_event_queue_poll (events, &ev)) {
 		switch (ev.type) {
 			case VISUAL_EVENT_RESIZE:
-				act_infinite_dimension (plugin, ev.event.resize.video,
-						ev.event.resize.width, ev.event.resize.height);
+				act_infinite_resize (plugin, ev.event.resize.width, ev.event.resize.height);
 				break;
 			default: /* to avoid warnings */
 				break;

diff --git a/libvisual-plugins/plugins/actor/jakdaw/actor_jakdaw.c b/libvisual-plugins/plugins/actor/jakdaw/actor_jakdaw.c
@@ -42,7 +42,7 @@ const VisPluginInfo *get_plugin_info (void);
 static int act_jakdaw_init (VisPluginData *plugin);
 static int act_jakdaw_cleanup (VisPluginData *plugin);
 static int act_jakdaw_requisition (VisPluginData *plugin, int *width, int *height);
-static int act_jakdaw_dimension (VisPluginData *plugin, VisVideo *video, int width, int height);
+static int act_jakdaw_resize (VisPluginData *plugin, int width, int height);
 static int act_jakdaw_events (VisPluginData *plugin, VisEventQueue *events);
 static VisPalette *act_jakdaw_palette (VisPluginData *plugin);
 static int act_jakdaw_render (VisPluginData *plugin, VisVideo *video, VisAudio *audio);
@@ -178,12 +178,10 @@ static int act_jakdaw_requisition (VisPluginData *plugin, int *width, int *heigh
 	return 0;
 }
 
-static int act_jakdaw_dimension (VisPluginData *plugin, VisVideo *video, int width, int height)
+static int act_jakdaw_resize (VisPluginData *plugin, int width, int height)
 {
 	JakdawPrivate *priv = visual_object_get_private (VISUAL_OBJECT (plugin));
 
-	visual_video_set_dimension (video, width, height);
-
 	priv->xres = width;
 	priv->yres = height;
 
@@ -201,8 +199,7 @@ static int act_jakdaw_events (VisPluginData *plugin, VisEventQueue *events)
 	while (visual_event_queue_poll (events, &ev)) {
 		switch (ev.type) {
 			case VISUAL_EVENT_RESIZE:
-				act_jakdaw_dimension (plugin, ev.event.resize.video,
-						ev.event.resize.width, ev.event.resize.height);
+				act_jakdaw_resize (plugin, ev.event.resize.width, ev.event.resize.height);
 				break;
 
 			case VISUAL_EVENT_PARAM: