From cb835844c171936a698321267a4e5a0b7a0abe5e Mon Sep 17 00:00:00 2001 From: Luis de Bethencourt Date: Mon, 2 May 2011 17:45:25 +0200 Subject: cleanup: style fixes --- src/gst_engine.c | 3 +- src/gst_engine.h | 4 +- src/screensaver.h | 3 +- src/user_interface.c | 135 ++++++++++++++++++++++++++++++--------------------- src/user_interface.h | 4 +- 5 files changed, 88 insertions(+), 61 deletions(-) diff --git a/src/gst_engine.c b/src/gst_engine.c index 11ba470..1d840b4 100644 --- a/src/gst_engine.c +++ b/src/gst_engine.c @@ -135,7 +135,8 @@ discover (GstEngine * engine, gchar * uri) v_info = (GstDiscovererVideoInfo *) list->data; engine->media_width = gst_discoverer_video_info_get_width (v_info); engine->media_height = gst_discoverer_video_info_get_height (v_info); - g_print ("Found video dimensions: %dx%d\n", engine->media_width, engine->media_height); + g_print ("Found video dimensions: %dx%d\n", engine->media_width, + engine->media_height); } else { g_object_get (G_OBJECT (engine->player), "flags", &flags, NULL); g_object_set (G_OBJECT (engine->player), "flags", diff --git a/src/gst_engine.h b/src/gst_engine.h index a0c71a9..64f0582 100644 --- a/src/gst_engine.h +++ b/src/gst_engine.h @@ -23,7 +23,9 @@ #ifndef __GST_ENGINE_H__ #define __GST_ENGINE_H__ -G_BEGIN_DECLS typedef struct _GstEngine GstEngine; +G_BEGIN_DECLS + +typedef struct _GstEngine GstEngine; struct _GstEngine { diff --git a/src/screensaver.h b/src/screensaver.h index 522854f..888c59d 100644 --- a/src/screensaver.h +++ b/src/screensaver.h @@ -30,10 +30,9 @@ G_BEGIN_DECLS typedef struct _ScreenSaver ScreenSaver; -ScreenSaver * screensaver_new (ClutterStage * stage); +ScreenSaver *screensaver_new (ClutterStage * stage); void screensaver_enable (ScreenSaver * screensaver, gboolean enable); void screensaver_free (ScreenSaver * screensaver); G_END_DECLS - #endif /* __SCREENSAVER_H__ */ diff --git a/src/user_interface.c b/src/user_interface.c index 643e7f5..c47a5ce 100644 --- a/src/user_interface.c +++ b/src/user_interface.c @@ -374,11 +374,12 @@ load_controls (UserInterface * ui) } clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (main_box_layout), - ui->control_play_toggle, FALSE, /* expand */ - FALSE, /* x-fill */ - FALSE, /* y-fill */ - CLUTTER_BOX_ALIGNMENT_START, /* x-align */ - CLUTTER_BOX_ALIGNMENT_CENTER); /* y-align */ + ui->control_play_toggle, + FALSE, /* expand */ + FALSE, /* x-fill */ + FALSE, /* y-fill */ + CLUTTER_BOX_ALIGNMENT_START, /* x-align */ + CLUTTER_BOX_ALIGNMENT_CENTER); /* y-align */ clutter_container_add_actor (CLUTTER_CONTAINER (ui->control_box), ui->main_box); g_assert (ui->control_bg && ui->control_play_toggle); @@ -394,11 +395,12 @@ load_controls (UserInterface * ui) clutter_text_set_max_length (CLUTTER_TEXT (ui->control_title), ui->title_length); clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (info_box_layout), - ui->control_title, TRUE, /* expand */ - FALSE, /* x-fill */ - FALSE, /* y-fill */ - CLUTTER_BOX_ALIGNMENT_CENTER, /* x-align */ - CLUTTER_BOX_ALIGNMENT_START); /* y-align */ + ui->control_title, + TRUE, /* expand */ + FALSE, /* x-fill */ + FALSE, /* y-fill */ + CLUTTER_BOX_ALIGNMENT_CENTER, /* x-align */ + CLUTTER_BOX_ALIGNMENT_START); /* y-align */ // Controls seek seek_box_layout = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_FIXED, @@ -418,12 +420,11 @@ load_controls (UserInterface * ui) clutter_container_add_actor (CLUTTER_CONTAINER (seek_box), ui->control_seekbar); - clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (info_box_layout), - seek_box, TRUE, /* expand */ - FALSE, /* x-fill */ - FALSE, /* y-fill */ - CLUTTER_BOX_ALIGNMENT_CENTER, /* x-align */ - CLUTTER_BOX_ALIGNMENT_CENTER); /* y-align */ + clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (info_box_layout), seek_box, TRUE, /* expand */ + FALSE, /* x-fill */ + FALSE, /* y-fill */ + CLUTTER_BOX_ALIGNMENT_CENTER, /* x-align */ + CLUTTER_BOX_ALIGNMENT_CENTER); /* y-align */ // Controls bottom box bottom_box_layout = clutter_box_layout_new (); @@ -439,9 +440,7 @@ load_controls (UserInterface * ui) ui->volume_box = clutter_box_new (volume_box_layout); clutter_box_pack (CLUTTER_BOX (bottom_box), ui->volume_box, - "x-align", CLUTTER_BOX_ALIGNMENT_START, - "expand", TRUE, - NULL); + "x-align", CLUTTER_BOX_ALIGNMENT_START, "expand", TRUE, NULL); // Controls volume low ui->volume_low = clutter_texture_new_from_file (ui->volume_low_png, &error); @@ -468,9 +467,7 @@ load_controls (UserInterface * ui) clutter_box_pack (CLUTTER_BOX (ui->volume_box), vol_int_box, "x-fill", FALSE, - "y-fill", FALSE, - "y-align", CLUTTER_BOX_ALIGNMENT_CENTER, - NULL); + "y-fill", FALSE, "y-align", CLUTTER_BOX_ALIGNMENT_CENTER, NULL); // Controls volume high ui->volume_high = clutter_texture_new_from_file (ui->volume_high_png, &error); @@ -488,22 +485,20 @@ load_controls (UserInterface * ui) ui->control_pos = clutter_text_new_full ("Sans 22px", duration_str, &control_color1); clutter_box_pack (CLUTTER_BOX (bottom_box), ui->control_pos, - "x-align", CLUTTER_BOX_ALIGNMENT_END, - "expand", TRUE, - NULL); + "x-align", CLUTTER_BOX_ALIGNMENT_END, "expand", TRUE, NULL); - clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (info_box_layout), - bottom_box, TRUE, /* expand */ - FALSE, /* x-fill */ - FALSE, /* y-fill */ - CLUTTER_BOX_ALIGNMENT_CENTER, /* x-align */ - CLUTTER_BOX_ALIGNMENT_END); /* y-align */ + clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (info_box_layout), bottom_box, + TRUE, /* expand */ + FALSE, /* x-fill */ + FALSE, /* y-fill */ + CLUTTER_BOX_ALIGNMENT_CENTER, /* x-align */ + CLUTTER_BOX_ALIGNMENT_END); /* y-align */ clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (main_box_layout), ui->info_box, - FALSE, /* expand */ - TRUE, /* x-fill */ - FALSE, /* y-fill */ - CLUTTER_BOX_ALIGNMENT_END, /* x-align */ + FALSE, /* expand */ + TRUE, /* x-fill */ + FALSE, /* y-fill */ + CLUTTER_BOX_ALIGNMENT_END, /* x-align */ CLUTTER_BOX_ALIGNMENT_CENTER); /* y-align */ clutter_actor_lower_bottom (ui->control_bg); @@ -645,7 +640,8 @@ size_change (ClutterStage * stage, UserInterface * ui) stage_width = clutter_actor_get_width (ui->stage); stage_height = clutter_actor_get_height (ui->stage); - g_print ("actor media %fx%f, stage %fx%f\n", media_width, media_height, stage_width, stage_height); + g_print ("actor media %fx%f, stage %fx%f\n", media_width, media_height, + stage_width, stage_height); ui->stage_width = stage_width; ui->stage_height = stage_height; @@ -672,7 +668,8 @@ size_change (ClutterStage * stage, UserInterface * ui) new_width = stage_height * media_ar; } } else { - g_debug ("Warning: not considering texture dimensions %fx%f\n", media_width, media_height); + g_debug ("Warning: not considering texture dimensions %fx%f\n", media_width, + media_height); } clutter_actor_set_size (CLUTTER_ACTOR (ui->texture), new_width, new_height); @@ -764,7 +761,8 @@ update_controls_size (UserInterface * ui) gfloat ctl_width, ctl_height, text_width; gfloat icon_size; - g_print ("Updating controls size for stage: %ux%u\n", ui->stage_width, ui->stage_height); + g_print ("Updating controls size for stage: %ux%u\n", ui->stage_width, + ui->stage_height); ctl_width = ui->stage_width * CONTROLS_WIDTH_RATIO; ctl_height = ui->stage_height * CONTROLS_HEIGHT_RATIO; @@ -775,52 +773,76 @@ update_controls_size (UserInterface * ui) ctl_height = ctl_width / CONTROLS_ASPECT_RATIO; } - g_print ("control box/bg: %fx%f\n", ctl_width + (ctl_width/BG_W) * SHADOW_RIGHT, ctl_height + (ctl_height/BG_H) * SHADOW_BOTTOM); - clutter_actor_set_size (ui->control_box, ctl_width + (ctl_width/BG_W) * SHADOW_RIGHT, ctl_height + (ctl_height/BG_H) * SHADOW_BOTTOM); - clutter_actor_set_size (ui->control_bg, ctl_width + (ctl_width/BG_W) * SHADOW_RIGHT, ctl_height + (ctl_height/BG_H) * SHADOW_BOTTOM); - g_print ("main box: %fx%f at (%f,%f)\n", ctl_width * MAIN_BOX_W, ctl_height * MAIN_BOX_H, ctl_width * (1.0f - MAIN_BOX_W) / 2.0f, ctl_height * (1.0f - MAIN_BOX_H) / 2.0f); - clutter_actor_set_size (ui->main_box, ctl_width * MAIN_BOX_W, ctl_height * MAIN_BOX_H); - clutter_actor_set_position (ui->main_box, ctl_width * (1.0f - MAIN_BOX_W) / 2.0f, ctl_height * (1.0f - MAIN_BOX_H) / 2.0f); + g_print ("control box/bg: %fx%f\n", + ctl_width + (ctl_width / BG_W) * SHADOW_RIGHT, + ctl_height + (ctl_height / BG_H) * SHADOW_BOTTOM); + clutter_actor_set_size (ui->control_box, + ctl_width + (ctl_width / BG_W) * SHADOW_RIGHT, + ctl_height + (ctl_height / BG_H) * SHADOW_BOTTOM); + clutter_actor_set_size (ui->control_bg, + ctl_width + (ctl_width / BG_W) * SHADOW_RIGHT, + ctl_height + (ctl_height / BG_H) * SHADOW_BOTTOM); + g_print ("main box: %fx%f at (%f,%f)\n", ctl_width * MAIN_BOX_W, + ctl_height * MAIN_BOX_H, ctl_width * (1.0f - MAIN_BOX_W) / 2.0f, + ctl_height * (1.0f - MAIN_BOX_H) / 2.0f); + clutter_actor_set_size (ui->main_box, ctl_width * MAIN_BOX_W, + ctl_height * MAIN_BOX_H); + clutter_actor_set_position (ui->main_box, + ctl_width * (1.0f - MAIN_BOX_W) / 2.0f, + ctl_height * (1.0f - MAIN_BOX_H) / 2.0f); icon_size = ctl_height * PLAY_TOGGLE_RATIO; clutter_actor_set_size (ui->control_play_toggle, icon_size, icon_size); g_print ("play toggle: %fx%f\n", icon_size, icon_size); - clutter_actor_set_size (ui->info_box, ctl_width * MAIN_BOX_W - icon_size, ctl_height * MAIN_BOX_H * MAIN_BOX_H); + clutter_actor_set_size (ui->info_box, ctl_width * MAIN_BOX_W - icon_size, + ctl_height * MAIN_BOX_H * MAIN_BOX_H); - font_name = g_strdup_printf ("Sans %dpx", (gint)(ctl_width * TITLE_RATIO)); + font_name = g_strdup_printf ("Sans %dpx", (gint) (ctl_width * TITLE_RATIO)); clutter_text_set_font_name (CLUTTER_TEXT (ui->control_title), font_name); text_width = clutter_actor_get_width (CLUTTER_ACTOR (ui->control_title)); - g_print ("control title: %dpx, %fx%f\n", (gint)(ctl_height * TITLE_RATIO), text_width, clutter_actor_get_height (CLUTTER_ACTOR (ui->control_title))); + g_print ("control title: %dpx, %fx%f\n", (gint) (ctl_height * TITLE_RATIO), + text_width, clutter_actor_get_height (CLUTTER_ACTOR (ui->control_title))); ui->seek_width = (ctl_width * MAIN_BOX_W - icon_size) * SEEK_WIDTH_RATIO; ui->seek_height = ctl_height * MAIN_BOX_H * SEEK_HEIGHT_RATIO; clutter_actor_set_size (ui->control_seek1, ui->seek_width, ui->seek_height); clutter_actor_set_position (ui->control_seek1, 0, 0); - g_print ("control seek1: %fx%f at (%f,%f)\n", ui->seek_width, ui->seek_height, 0.0f, 0.0f); + g_print ("control seek1: %fx%f at (%f,%f)\n", ui->seek_width, ui->seek_height, + 0.0f, 0.0f); - clutter_actor_set_size (ui->control_seek2, ui->seek_width - 2.0f * SEEK_BORDER, ui->seek_height - 2.0f * SEEK_BORDER); + clutter_actor_set_size (ui->control_seek2, + ui->seek_width - 2.0f * SEEK_BORDER, + ui->seek_height - 2.0f * SEEK_BORDER); clutter_actor_set_position (ui->control_seek2, SEEK_BORDER, SEEK_BORDER); - g_print ("control seek2: %fx%f at (%f,%f)\n", ui->seek_width - 2.0f * SEEK_BORDER, ui->seek_height - 2.0f * SEEK_BORDER, SEEK_BORDER, SEEK_BORDER); + g_print ("control seek2: %fx%f at (%f,%f)\n", + ui->seek_width - 2.0f * SEEK_BORDER, ui->seek_height - 2.0f * SEEK_BORDER, + SEEK_BORDER, SEEK_BORDER); progress_update_seekbar (ui); clutter_actor_set_position (ui->control_seekbar, SEEK_BORDER, SEEK_BORDER); g_print ("control seekbar: at (%f,%f)\n", SEEK_BORDER, SEEK_BORDER); - font_name = g_strdup_printf ("Sans %dpx", (gint)(ctl_height * POS_RATIO)); + font_name = g_strdup_printf ("Sans %dpx", (gint) (ctl_height * POS_RATIO)); clutter_text_set_font_name (CLUTTER_TEXT (ui->control_pos), font_name); text_width = clutter_actor_get_width (CLUTTER_ACTOR (ui->control_pos)); - g_print ("control pos: %dpx, %fx%f\n", (gint)(ctl_height * POS_RATIO), text_width, clutter_actor_get_height (CLUTTER_ACTOR (ui->control_pos))); + g_print ("control pos: %dpx, %fx%f\n", (gint) (ctl_height * POS_RATIO), + text_width, clutter_actor_get_height (CLUTTER_ACTOR (ui->control_pos))); - ui->volume_width = (ctl_width * MAIN_BOX_W - icon_size - clutter_actor_get_width (CLUTTER_ACTOR (ui->control_pos))) * VOLUME_WIDTH_RATIO; + ui->volume_width = + (ctl_width * MAIN_BOX_W - icon_size - + clutter_actor_get_width (CLUTTER_ACTOR (ui->control_pos))) * + VOLUME_WIDTH_RATIO; ui->volume_height = ctl_height * MAIN_BOX_H * VOLUME_HEIGHT_RATIO; clutter_actor_set_size (ui->vol_int_bg, ui->volume_width, ui->volume_height); clutter_actor_set_position (ui->vol_int_bg, 0, 0); - g_print ("vol_int_bg: %fx%f at (%f,%f)\n", ui->volume_width, ui->volume_height, 0.0f, 0.0f); + g_print ("vol_int_bg: %fx%f at (%f,%f)\n", ui->volume_width, + ui->volume_height, 0.0f, 0.0f); icon_size = ctl_height * VOLUME_ICON_RATIO; clutter_actor_set_size (ui->volume_low, icon_size, icon_size); - clutter_actor_set_size (ui->volume_high, icon_size * 1.2f /* originally 120x100 */, icon_size); + clutter_actor_set_size (ui->volume_high, + icon_size * 1.2f /* originally 120x100 */ , icon_size); g_print ("vol_icon_size: %f\n", icon_size); update_volume (ui, -1); @@ -859,7 +881,8 @@ load_user_interface (UserInterface * ui) ui->media_height = ui->engine->media_height; ui->stage_width = ui->engine->media_width; ui->stage_height = ui->engine->media_height; - g_print ("ui media: %ux%u, stage: %ux%u\n", ui->media_width, ui->media_height, ui->stage_width, ui->stage_height); + g_print ("ui media: %ux%u, stage: %ux%u\n", ui->media_width, ui->media_height, + ui->stage_width, ui->stage_height); ui->stage = clutter_stage_get_default (); ui->controls_showing = FALSE; ui->keep_showing_controls = FALSE; diff --git a/src/user_interface.h b/src/user_interface.h index d6ec690..1d24619 100644 --- a/src/user_interface.h +++ b/src/user_interface.h @@ -65,7 +65,9 @@ #define PENALTY_TIME 500 -G_BEGIN_DECLS typedef struct _UserInterface UserInterface; +G_BEGIN_DECLS + +typedef struct _UserInterface UserInterface; struct _UserInterface { -- cgit v1.2.3