summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis de Bethencourt <luis@debethencourt.com>2011-05-02 18:17:07 +0200
committerLuis de Bethencourt <luis@debethencourt.com>2011-05-02 18:17:07 +0200
commit17d4b01a4ff0f9955171f6837b28b9ee7d201ce5 (patch)
tree2e6bff93c028f2ae1afdab3b2fedc8592fb4e3f9
parentcb835844c171936a698321267a4e5a0b7a0abe5e (diff)
cleanup: remove dev auxiliary prints
-rw-r--r--src/gst_engine.c8
-rw-r--r--src/snappy.c2
-rw-r--r--src/user_interface.c36
-rw-r--r--src/utils.c2
4 files changed, 14 insertions, 34 deletions
diff --git a/src/gst_engine.c b/src/gst_engine.c
index 1d840b4..fb0b2a1 100644
--- a/src/gst_engine.c
+++ b/src/gst_engine.c
@@ -128,15 +128,17 @@ discover (GstEngine * engine, gchar * uri)
if (engine->has_video || engine->has_audio)
engine->media_duration = gst_discoverer_info_get_duration (info);
- g_print ("Found video %d, audio %d\n", engine->has_video, engine->has_audio);
+ // g_print ("Found video %d, audio %d\n", engine->has_video,
+ // engine->has_audio);
if (engine->has_video) {
list = gst_discoverer_info_get_video_streams (info);
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/snappy.c b/src/snappy.c
index 44f120d..8498b6a 100644
--- a/src/snappy.c
+++ b/src/snappy.c
@@ -151,7 +151,6 @@ main (int argc, char *argv[])
sink = clutter_gst_video_sink_new (CLUTTER_TEXTURE (video_texture));
ok = engine_init (engine, sink);
- g_print ("media %dx%d\n", ui->engine->media_width, ui->engine->media_height);
if (!ok)
goto quit;
ui->texture = video_texture;
@@ -166,7 +165,6 @@ main (int argc, char *argv[])
}
engine_load_uri (engine, uri);
- g_print ("media %dx%d\n", ui->engine->media_width, ui->engine->media_height);
interface_load_uri (ui, uri);
load_user_interface (ui);
diff --git a/src/user_interface.c b/src/user_interface.c
index c47a5ce..2b0ce10 100644
--- a/src/user_interface.c
+++ b/src/user_interface.c
@@ -640,8 +640,6 @@ 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);
ui->stage_width = stage_width;
ui->stage_height = stage_height;
@@ -761,8 +759,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;
@@ -773,18 +771,12 @@ 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,
@@ -793,41 +785,30 @@ update_controls_size (UserInterface * ui)
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);
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)));
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);
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);
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));
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)));
ui->volume_width =
(ctl_width * MAIN_BOX_W - icon_size -
@@ -836,14 +817,11 @@ update_controls_size (UserInterface * ui)
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);
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);
- g_print ("vol_icon_size: %f\n", icon_size);
update_volume (ui, -1);
}
@@ -877,22 +855,26 @@ load_user_interface (UserInterface * ui)
// Init UserInterface structure variables
ui->filename = g_path_get_basename (ui->fileuri);
+
ui->media_width = ui->engine->media_width;
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);
ui->stage = clutter_stage_get_default ();
+
ui->controls_showing = FALSE;
ui->keep_showing_controls = FALSE;
ui->penalty_box_active = FALSE;
ui->controls_timeout = -1;
+
ui->seek_width = ui->stage_width / SEEK_WIDTH_RATIO;
ui->seek_height = ui->stage_height / SEEK_HEIGHT_RATIO;
+
ui->progress_id = -1;
ui->title_length = TITLE_LENGTH;
ui->duration_str = position_ns_to_str (ui->engine->media_duration);
+
ui->rotated = FALSE;
clutter_stage_set_color (CLUTTER_STAGE (ui->stage), &stage_color);
@@ -907,8 +889,6 @@ load_user_interface (UserInterface * ui)
ui->stage_height);
}
- g_print ("Stage dimensions: %ux%u\n", ui->stage_width, ui->stage_height);
-
// Controls
load_controls (ui);
diff --git a/src/utils.c b/src/utils.c
index 4a17e68..fe29010 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -44,7 +44,7 @@ cut_long_filename (gchar * filename, gint length)
}
if (ret == NULL)
- g_print ("really?\n");
+ g_print ("no filename. really?\n");
return ret;
}