[cheese] Avoid using libgee
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese] Avoid using libgee
- Date: Sun, 20 Jan 2013 11:59:12 +0000 (UTC)
commit 4dc020519fb57a9e0fac806ce9b421a551ffa2a4
Author: David King <amigadave amigadave com>
Date: Sun Jan 20 11:51:19 2013 +0000
Avoid using libgee
Rather than port to libgee 0.8, drop use of it entirely.
src/cheese-effects-manager.vala | 79 +++++++++--------
src/cheese-window.vala | 184 ++++++++++++++++++++-------------------
2 files changed, 140 insertions(+), 123 deletions(-)
---
diff --git a/src/cheese-effects-manager.vala b/src/cheese-effects-manager.vala
index 4ad6dd6..4e6cf90 100644
--- a/src/cheese-effects-manager.vala
+++ b/src/cheese-effects-manager.vala
@@ -20,53 +20,62 @@
*/
using GLib;
-using Gee;
-
-const string GROUP_NAME = "Effect";
internal class Cheese.EffectsManager : GLib.Object
{
- public ArrayList<Effect> effects;
+ public List<Effect> effects;
- public EffectsManager ()
- {
- effects = new ArrayList<Effect>((EqualFunc) cmp_value);
- }
+ public EffectsManager ()
+ {
+ effects = new List<Effect> ();
+ }
- /**
- * Add the effects into the manager.
- */
- public void load_effects ()
- {
- GLib.List<Cheese.Effect> effect_list = Cheese.Effect.load_effects ();
- for (int i = 0; i < effect_list.length (); i++)
- effects.add (effect_list<Cheese.Effect>.nth (i).data);
+ /**
+ * Add the effects into the manager.
+ */
+ public void load_effects ()
+ {
+ var loaded_effects = Cheese.Effect.load_effects ();
+ var effects_hash = new HashTable<string, Effect> (str_hash, str_equal);
- effects.sort ((CompareFunc) sort_value);
+ foreach (var effect in loaded_effects)
+ {
+ effects_hash.insert (effect.name, effect);
+ }
- /* add identity effect as the first in the effect list */
- if (effects.size > 0)
+ effects_hash.foreach (add_effect);
+
+ /* Add identity effect as the first in the effect list. */
+ if (effects.length () > 0)
+ {
+ Effect e = new Effect (_("No Effect"), "identity");
+ effects.prepend (e);
+ }
+ }
+
+ /**
+ * Add an effect into the manager. Used as a HFunc.
+ */
+ private void add_effect (string name, Effect effect)
{
- Effect e = new Effect (_("No Effect"), "identity");
- effects.insert (0, e);
+ effects.insert_sorted (effect, sort_value);
}
- }
- /**
- * Search for and return the requested effect.
- *
- * @param name the name of the effect to search for
- * @return the effect that which matches the supplied name, or null
- */
- public Effect ? get_effect (string name)
- {
- foreach (Effect eff in effects)
+ /**
+ * Search for and return the requested effect.
+ *
+ * @param name the name of the effect to search for
+ * @return the effect which matches the supplied name, or null
+ */
+ public Effect ? get_effect (string name)
{
- if (eff.name == name)
- return eff;
+ foreach (var effect in effects)
+ {
+ if (effect.name == name)
+ return effect;
+ }
+ return null;
}
- return null;
- }
/**
* Compare two effects by the pipeline description.
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index 30df86d..4c7ade5 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -26,7 +26,6 @@ using Clutter;
using Config;
using Eog;
using Gst;
-using Gee;
using CanberraGtk;
[DBus(name = "org.freedesktop.PackageKit.Modify")]
@@ -35,7 +34,7 @@ interface PkProxy : GLib.Object {
}
const int FULLSCREEN_TIMEOUT_INTERVAL = 5 * 1000;
-const int EFFECTS_PER_PAGE = 9;
+const uint EFFECTS_PER_PAGE = 9;
const string SENDTO_EXEC = "nautilus-sendto";
public class Cheese.MainWindow : Gtk.ApplicationWindow
@@ -75,10 +74,11 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
private Clutter.Text error_layer;
private Clutter.Text timeout_layer;
- private Clutter.Box current_effects_grid;
- private int current_effects_page = 0;
- private ArrayList<Clutter.Box> effects_grids;
+ private Clutter.Box current_effects_grid;
+ private uint current_effects_page = 0;
+ private List<Clutter.Box> effects_grids;
+ private HashTable<string, bool> action_sensitivities;
private Gtk.ToggleAction wide_mode_action;
private Gtk.Action countdown_action;
private Gtk.Action effects_page_prev_action;
@@ -1064,7 +1064,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
{
if (current_effects_page != 0)
{
- activate_effects_page (current_effects_page - 1);
+ activate_effects_page ((int)current_effects_page - 1);
}
}
@@ -1076,9 +1076,9 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
[CCode (instance_pos = -1)]
public void on_next_effects_page (Gtk.Action action)
{
- if (current_effects_page != (effects_manager.effects.size / EFFECTS_PER_PAGE))
+ if (current_effects_page != (effects_manager.effects.length () / EFFECTS_PER_PAGE))
{
- activate_effects_page (current_effects_page + 1);
+ activate_effects_page ((int)current_effects_page + 1);
}
}
@@ -1096,30 +1096,35 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
{
viewport_layout.remove ((Clutter.Actor) current_effects_grid);
}
- current_effects_grid = effects_grids[number];
+ current_effects_grid = effects_grids.nth_data (number);
current_effects_grid.set ("opacity", 0);
viewport_layout.add ((Clutter.Actor) current_effects_grid);
current_effects_grid.animate (Clutter.AnimationMode.LINEAR, 1000, "opacity", 255);
- for (int i = 0; i < effects_manager.effects.size; i++)
+ uint i = 0;
+ foreach (var effect in effects_manager.effects)
{
- int page_of_effect = i / EFFECTS_PER_PAGE;
- Cheese.Effect effect = effects_manager.effects[i];
- if (page_of_effect == number)
- {
- if (!effect.is_preview_connected ())
+ uint page_nr = i / EFFECTS_PER_PAGE;
+ if (page_nr == number)
{
- Clutter.Texture texture = effect.get_data<Clutter.Texture> ("texture");
- camera.connect_effect_texture (effect, texture);
+ if (!effect.is_preview_connected ())
+ {
+ Clutter.Texture texture = effect.get_data<Clutter.Texture> ("texture");
+ camera.connect_effect_texture (effect, texture);
+ }
+ effect.enable_preview ();
}
- effect.enable_preview ();
- }
- else
- {
- if (effect.is_preview_connected ())
- effect.disable_preview ();
- }
+ else
+ {
+ if (effect.is_preview_connected ())
+ {
+ effect.disable_preview ();
+ }
+ }
+
+ i++;
}
+
setup_effects_page_switch_sensitivity ();
}
@@ -1130,7 +1135,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
{
effects_page_prev_action.sensitive = (is_effects_selector_active && current_effects_page != 0);
effects_page_next_action.sensitive =
- (is_effects_selector_active && current_effects_page != effects_manager.effects.size / EFFECTS_PER_PAGE);
+ (is_effects_selector_active && current_effects_page != effects_manager.effects.length () / EFFECTS_PER_PAGE);
}
/**
@@ -1145,7 +1150,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
{
video_preview.hide ();
- if (effects_grids.size == 0)
+ if (effects_grids.length () == 0)
{
error_layer.text = _("No effects found");
error_layer.show ();
@@ -1153,12 +1158,12 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
else
{
current_effects_grid.show ();
- activate_effects_page (current_effects_page);
+ activate_effects_page ((int)current_effects_page);
}
}
else
{
- if (effects_grids.size == 0)
+ if (effects_grids.length () == 0)
{
error_layer.hide ();
}
@@ -1184,26 +1189,26 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
effects_manager.load_effects ();
/* Must initialize effects_grids before returning, as it is dereferenced later, bug 654671. */
- effects_grids = new ArrayList<Clutter.Box> ();
+ effects_grids = new List<Clutter.Box> ();
- if (effects_manager.effects.size == 0)
+ if (effects_manager.effects.length () == 0)
{
warning ("gnome-video-effects is not installed.");
return;
}
- for (int i = 0; i <= effects_manager.effects.size / EFFECTS_PER_PAGE; i++)
+ foreach (var effect in effects_manager.effects)
{
- Clutter.TableLayout table_layout = new TableLayout ();
- Clutter.Box grid = new Clutter.Box (table_layout);
- effects_grids.add (grid);
- table_layout.set_column_spacing (10);
- table_layout.set_row_spacing (10);
+ Clutter.TableLayout table_layout = new TableLayout ();
+ Clutter.Box grid = new Clutter.Box (table_layout);
+ effects_grids.append (grid);
+ table_layout.set_column_spacing (10);
+ table_layout.set_row_spacing (10);
}
- for (int i = 0; i < effects_manager.effects.size; i++)
+ uint i = 0;
+ foreach (var effect in effects_manager.effects)
{
- Effect effect = effects_manager.effects[i];
Clutter.Texture texture = new Clutter.Texture ();
Clutter.BinLayout layout = new Clutter.BinLayout (Clutter.BinAlignment.CENTER,
Clutter.BinAlignment.CENTER);
@@ -1234,19 +1239,20 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
"x-align", Clutter.BinAlignment.CENTER,
"y-align", Clutter.BinAlignment.END, null);
- Clutter.TableLayout table_layout = (Clutter.TableLayout) effects_grids[i / EFFECTS_PER_PAGE].layout_manager;
+ Clutter.TableLayout table_layout = (Clutter.TableLayout) effects_grids.nth_data (i / EFFECTS_PER_PAGE).layout_manager;
table_layout.pack ((Clutter.Actor) box,
- (i % EFFECTS_PER_PAGE) % 3,
- (i % EFFECTS_PER_PAGE) / 3);
+ ((int)(i % EFFECTS_PER_PAGE)) % 3,
+ ((int)(i % EFFECTS_PER_PAGE)) / 3);
table_layout.set_expand (box, false, false);
+
+ i++;
}
setup_effects_page_switch_sensitivity ();
- current_effects_grid = effects_grids[0];
+ current_effects_grid = effects_grids.nth_data (0);
}
}
- private Gee.HashMap<string, bool> action_sensitivities;
/**
* Toggle the sensitvity of the camera actions.
*
@@ -1254,58 +1260,60 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
*/
public void toggle_camera_actions_sensitivities (bool active)
{
- is_camera_actions_sensitive = active;
- if (active)
- {
- foreach (string key in action_sensitivities.keys)
+ is_camera_actions_sensitive = active;
+ if (active)
{
- Gtk.Action action = gtk_builder.get_object (key) as Gtk.Action;
- action.sensitive = action_sensitivities.get (key);
+ var keys = action_sensitivities.get_keys ();
+ foreach (var key in keys)
+ {
+ Gtk.Action action = gtk_builder.get_object (key) as Gtk.Action;
+ action.sensitive = action_sensitivities.get (key);
+ }
}
- }
- else
- {
- action_sensitivities = new HashMap<string, bool> (GLib.str_hash);
- GLib.SList<weak GLib.Object> objects = gtk_builder.get_objects ();
- foreach (GLib.Object obj in objects)
+ else
{
- if (obj is Gtk.Action)
- {
- Gtk.Action action = (Gtk.Action)obj;
- action_sensitivities.set (action.name, action.sensitive);
- }
- }
+ action_sensitivities = new HashTable<string, bool> (GLib.str_hash,
+ GLib.direct_equal);
+ GLib.SList<weak GLib.Object> objects = gtk_builder.get_objects ();
+ foreach (GLib.Object obj in objects)
+ {
+ if (obj is Gtk.Action)
+ {
+ Gtk.Action action = (Gtk.Action)obj;
+ action_sensitivities.set (action.name, action.sensitive);
+ }
+ }
- /* Keep only these actions sensitive. */
- string [] active_actions = { "quit",
- "help_contents",
- "about",
- "open",
- "save_as",
- "move_to_trash",
- "delete",
- "move_all_to_trash"};
-
- /* Gross hack because Vala's `in` operator doesn't really work */
- bool flag;
- foreach (GLib.Object obj in objects)
- {
- flag = false;
- if (obj is Gtk.Action)
- {
- Gtk.Action action = (Gtk.Action)obj;
- foreach (string s in active_actions)
+ /* Keep only these actions sensitive. */
+ string [] active_actions = { "quit",
+ "help_contents",
+ "about",
+ "open",
+ "save_as",
+ "move_to_trash",
+ "delete",
+ "move_all_to_trash"};
+
+ /* Gross hack because Vala's `in` operator doesn't really work */
+ bool flag;
+ foreach (GLib.Object obj in objects)
{
- if (action.name == s)
- {
- flag = true;
- }
+ flag = false;
+ if (obj is Gtk.Action)
+ {
+ Gtk.Action action = (Gtk.Action)obj;
+ foreach (string s in active_actions)
+ {
+ if (action.name == s)
+ {
+ flag = true;
+ }
+ }
+ if (!flag)
+ ((Gtk.Action)obj).sensitive = false;
+ }
}
- if (!flag)
- ((Gtk.Action)obj).sensitive = false;
- }
}
- }
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
