[snappy] ui: remove unnecessary macros



commit e2a0c2317790236abe4fce213ee46fa1ded53ef8
Author: Luis de Bethencourt <luis debethencourt com>
Date:   Wed May 2 11:05:49 2012 +0100

    ui: remove unnecessary macros

 src/user_interface.c |    6 +++---
 src/user_interface.h |    2 --
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/src/user_interface.c b/src/user_interface.c
index 042a36c..ae1a5a5 100644
--- a/src/user_interface.c
+++ b/src/user_interface.c
@@ -673,7 +673,7 @@ position_ns_to_str (gint64 nanoseconds)
   gint64 seconds;
   gint hours, minutes;
 
-  seconds = nanoseconds / NANOSEC;
+  seconds = nanoseconds / GST_SECOND;
   hours = seconds / SEC_IN_HOUR;
   seconds = seconds - (hours * SEC_IN_HOUR);
   minutes = seconds / SEC_IN_MIN;
@@ -1075,7 +1075,7 @@ interface_start (UserInterface * ui, gchar * uri)
       clutter_align_constraint_new (ui->stage, CLUTTER_ALIGN_Y_AXIS, 0.5));
 
   clutter_stage_hide_cursor (CLUTTER_STAGE (ui->stage));
-  clutter_actor_animate (ui->control_box, CLUTTER_EASE_OUT_QUINT, SECOND,
+  clutter_actor_animate (ui->control_box, CLUTTER_EASE_OUT_QUINT, GST_USECOND,
       "opacity", 0, NULL);
 
   g_signal_connect (CLUTTER_STAGE (ui->stage), "allocation-changed",
@@ -1088,7 +1088,7 @@ interface_start (UserInterface * ui, gchar * uri)
   ui->screensaver = screensaver_new (CLUTTER_STAGE (ui->stage));
   screensaver_enable (ui->screensaver, FALSE);
 
-  g_timeout_add (SECOND, progress_update_text, ui);
+  g_timeout_add (GST_USECOND, progress_update_text, ui);
 
   if (!ui->blind)
     clutter_actor_show (ui->stage);
diff --git a/src/user_interface.h b/src/user_interface.h
index e32cc4b..5f305d4 100644
--- a/src/user_interface.h
+++ b/src/user_interface.h
@@ -57,8 +57,6 @@
 
 #define TITLE_LENGTH 40
 
-#define SECOND 1000
-#define NANOSEC 1000000000
 #define SEC_IN_HOUR 3600
 #define SEC_IN_MIN 60
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]