comparison src/audacious/ui_svis.c @ 4220:e6ef8287d115

fixed menurow and some obvious svis issues from svis, but IMHO ui_svis needs a rewrite because of too much hardcoded stuff

4219:8a848179e244

}

static void ui_svis_size_request(GtkWidget *widget, GtkRequisition *requisition) {
    UiSVis *svis = UI_SVIS(widget);

    requisition->width = svis->width*(1+svis->scaled);
    requisition->height = svis->height*(1+svis->scaled);
}

static void ui_svis_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
    UiSVis *svis = UI_SVIS (widget);

    widget->allocation = *allocation;
    widget->allocation.x *= (1+svis->scaled);
    widget->allocation.y *= (1+svis->scaled);
    if (GTK_WIDGET_REALIZED (widget))
    {
        if (svis->event_window != NULL)
            gdk_window_move_resize(svis->event_window, widget->allocation.x, widget->allocation.y, allocation->width, allocation->height);
        else

                *ptr = svis_scope_colors[h];
            }
        }

    }
    else {   /*            svis scaling is disabled for now 

      memset(rgb_data, 0, SVIS_WIDTH * cfg.scale_factor * SVIS_HEIGHT * cfg.scale_factor);
      if (cfg.vis_type == VIS_ANALYZER && !playback_get_paused() && playback_get_playing()){
	  for(y=0; y < SVIS_HEIGHT; y++){
            if (cfg.analyzer_type == ANALYZER_BARS){

                *(ptr + 76) = svis_scope_colors[h];
                *(ptr + 77) = svis_scope_colors[h];
            }
        }

*/
    }

    GdkPixmap *obj = NULL;
    GdkGC *gc;
    obj = gdk_pixmap_new(NULL, svis->width* ( svis->scaled ? cfg.scale_factor : 1), 

4220:e6ef8287d115

}

static void ui_svis_size_request(GtkWidget *widget, GtkRequisition *requisition) {
    UiSVis *svis = UI_SVIS(widget);

    requisition->width = svis->width * (svis->scaled ? cfg.scale_factor : 1);
    requisition->height = svis->height*(svis->scaled ? cfg.scale_factor : 1);
}

static void ui_svis_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
    UiSVis *svis = UI_SVIS (widget);

    widget->allocation = *allocation;
    widget->allocation.x *= (svis->scaled ? cfg.scale_factor : 1 );
    widget->allocation.y *= (svis->scaled ? cfg.scale_factor : 1);
    if (GTK_WIDGET_REALIZED (widget))
    {
        if (svis->event_window != NULL)
            gdk_window_move_resize(svis->event_window, widget->allocation.x, widget->allocation.y, allocation->width, allocation->height);
        else

                *ptr = svis_scope_colors[h];
            }
        }

    }
    else {            /*svis scaling, this needs some work, since a lot of stuff is hardcoded --majeru*/

      memset(rgb_data, 0, SVIS_WIDTH * cfg.scale_factor * SVIS_HEIGHT * cfg.scale_factor);
      if (cfg.vis_type == VIS_ANALYZER && !playback_get_paused() && playback_get_playing()){
	  for(y=0; y < SVIS_HEIGHT; y++){
            if (cfg.analyzer_type == ANALYZER_BARS){

                *(ptr + 76) = svis_scope_colors[h];
                *(ptr + 77) = svis_scope_colors[h];
            }
        }


    }

    GdkPixmap *obj = NULL;
    GdkGC *gc;
    obj = gdk_pixmap_new(NULL, svis->width* ( svis->scaled ? cfg.scale_factor : 1),