E CVS: envision xenith

[<enl...@li...>]

Enlightenment CVS committal

Author  : xenith
Project : misc
Module  : envision

Dir     : misc/envision/src


Modified Files:
	callbacks.c callbacks.h envision.c envision.h 


Log Message:
Fletch, please try and keep with the established style.

And tabs are bad, m'kay?

===================================================================
RCS file: /cvsroot/enlightenment/misc/envision/src/callbacks.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- callbacks.c	7 Sep 2004 07:37:46 -0000	1.8
+++ callbacks.c	8 Sep 2004 05:22:09 -0000	1.9
@@ -1,5 +1,5 @@
 /*
- * $Id: callbacks.c,v 1.8 2004/09/07 07:37:46 fletch3k Exp $
+ * $Id: callbacks.c,v 1.9 2004/09/08 05:22:09 xenith Exp $
  * vim:expandtab:ts=3:sts=3:sw=3
  */
 
@@ -11,235 +11,197 @@
  * If the canvas is resized, resize the video too
  */
 void
-canvas_resize (Ecore_Evas * ee)
+canvas_resize(Ecore_Evas * ee)
 {
-  Evas *evas = ecore_evas_get (ee);
-  Evas_Object *edje = evas_object_name_find (evas, "edje");
-  Evas_Object *emotion = evas_object_name_find (evas, "emotion");
-  int w, h, vw, vh;
-  double ratio;
-  double x, y;
+   Evas *evas = ecore_evas_get(ee);
+   Evas_Object *edje = evas_object_name_find(evas, "edje");
+   Evas_Object *emotion = evas_object_name_find(evas, "emotion");
+   int w, h, vw, vh;
+   double ratio, x, y;
+
+   ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
+   evas_object_resize(edje, (Evas_Coord)w, (Evas_Coord)h);
+
+   emotion_object_size_get(emotion, &vw, &vh);
+   ratio = emotion_object_ratio_get(emotion);
+   printf("Ratio is: %f\n", ratio);
 
-  ecore_evas_geometry_get (ee, NULL, NULL, &w, &h);
-  evas_object_resize (edje, (Evas_Coord) w, (Evas_Coord) h);
-
-  emotion_object_size_get (emotion, &vw, &vh);
-  ratio = emotion_object_ratio_get (emotion);
-  printf ("Ratio is: %f\n", ratio);
-
-
-  if (ratio > 0.0)
-    {
+   if (ratio > 0.0) {
       x = 0;
       y = (h - (w / ratio)) / 2;
-
-      if (y < 0)
-	{
-	  y = 0;
-	  x = (w - (h * ratio)) / 2;
-	  w = h * ratio;
-	}
-      else
-	{
-	  h = w / ratio;
-	}
-
-      evas_object_resize (edje, (Evas_Coord) w, (Evas_Coord) h + 106);
-    }
-  else
-    {
-      if (vh > 0)
-	{
-	  ratio = (double) vw / (double) vh;
-	}
-      else
-	{
-	  ratio = 1.0;
-	}
-
+      if (y < 0) {
+         y = 0;
+         x = (w - (h * ratio)) / 2;
+         w = h * ratio;
+      } else {
+         h = w / ratio;
+      }
+
+      evas_object_resize (edje, (Evas_Coord)w, (Evas_Coord)h+106);
+   } else {
+      if (vh > 0) {
+         ratio = (double) vw / (double) vh;
+      } else {
+         ratio = 1.0;
+      }
       x = 0;
       y = (h - (w / ratio)) / 2;
 
-      if (y < 0)
-	{
-	  y = 0;
-	  x = (w - (h * ratio)) / 2;
-	  w = h * ratio;
-	}
-      else
-	{
-	  h = w / ratio;
-	}
+      if (y < 0) {
+         y = 0;
+         x = (w - (h * ratio)) / 2;
+         w = h * ratio;
+      } else {
+         h = w / ratio;
+      }
 
-      evas_object_resize (edje, (Evas_Coord) w + 25, (Evas_Coord) h + 106);
-    }
+      evas_object_resize (edje, (Evas_Coord)w+25, (Evas_Coord)h+106);
+   }
 }
 
 void
-update_timer (void *data, Evas_Object * obj, void *event_info)
+update_timer(void *data, Evas_Object * obj, void *event_info)
 {
-  Envision *e = data;
-  char buffer[512];
-  double len, pos;
-  int pos_h, pos_m, len_h, len_m;
-  double pos_s, len_s;
-
-  /* get the current position and length (in seconds) */
-  pos = emotion_object_position_get (e->gui.emotion);
-  len = emotion_object_play_length_get (e->gui.emotion);
-  /* now convert this into hrs:mins:secs */
-  pos_h = (int) pos / (60 * 60);
-  pos_m = ((int) pos / (60)) - (pos_h * 60);
-  pos_s = pos - (pos_h * 60 * 60) - (pos_m * 60);
-  len_h = (int) len / (60 * 60);
-  len_m = ((int) len / (60)) - (len_h * 60);
-  len_s = len - (len_h * 60 * 60) - (len_m * 60);
-  /* print this to a stirng buffer */
-  /* snprintf(buffer, sizeof(buffer), "%02i:%02i:%02.2f / %02i:%02i:%02.2f",
-     pos_h, pos_m, pos_s, len_h, len_m, len_s);        */
-  snprintf (buffer, sizeof (buffer), "%02i:%02i:%02.0f", pos_h, pos_m, pos_s);
-  edje_object_part_text_set (e->gui.edje, "time_text", buffer);
+   Envision *e = data;
+   char buffer[512];
+   double len, pos, pos_s, len_s;
+   int pos_h, pos_m, len_h, len_m;
+
+   /* get the current position and length (in seconds) */
+   pos = emotion_object_position_get(e->gui.emotion);
+   len = emotion_object_play_length_get(e->gui.emotion);
+
+   /* now convert this into hrs:mins:secs */
+   pos_h = (int)pos / (60 * 60);
+   pos_m = ((int)pos / (60)) - (pos_h * 60);
+   pos_s = pos - (pos_h * 60 * 60) - (pos_m * 60);
+   len_h = (int)len / (60 * 60);
+   len_m = ((int)len / (60)) - (len_h * 60);
+   len_s = len - (len_h * 60 * 60) - (len_m * 60);
+
+   /* print this to a string buffer */
+   /* snprintf(buffer, sizeof(buffer), "%02i:%02i:%02.2f / %02i:%02i:%02.2f",
+         pos_h, pos_m, pos_s, len_h, len_m, len_s); */
+   snprintf(buffer, sizeof(buffer), "%02i:%02i:%02.0f", pos_h, pos_m, pos_s);
+   edje_object_part_text_set(e->gui.edje, "time_text", buffer);
 }
 
 void
-callback_evas_keydown (void *data, Evas * e, Evas_Object * obj,
-		       void *event_info)
+callback_evas_keydown(void *data, Evas * e, Evas_Object * obj, void *event_info)
 {
-  Evas_Event_Key_Down *ev;
+   Evas_Event_Key_Down *ev;
 
-  int muted = 0;
+   ev = (Evas_Event_Key_Down *)event_info;
 
-  ev = (Evas_Event_Key_Down *) event_info;
+   // Debug
+   printf("You hit key: %s\n", ev->keyname);
 
-  // Debug
-  printf ("You hit key: %s\n", ev->keyname);
-
-  if (!strcmp (ev->keyname, "space"))
-    {
-      emotion_object_play_set (obj, 0);
-    }
-  else if (!strcmp (ev->keyname, "Return"))
-    {
-      emotion_object_play_set (obj, 1);
-    }
-  else if (!strcmp (ev->keyname, "Escape") || !strcmp (ev->keyname, "q"))
-    {
-      ecore_main_loop_quit ();
-    }
-  else if (!strcmp (ev->keyname, "m"))
-    {
-      if (muted == 0)
-	{
-	  emotion_object_audio_mute_set (obj, 1);
-	  muted = 1;
-	}
-      else
-	{
-	  emotion_object_audio_mute_set (obj, 0);
-	  muted = 0;
-	}
-    }
-  else if (!strcmp (ev->keyname, "Down"))
-    {
+   if (!strcmp(ev->keyname, "space")) {
+      emotion_object_play_set(obj, 0);
+   } else if (!strcmp(ev->keyname, "Return")) {
+      emotion_object_play_set(obj, 1);
+   } else if (!strcmp(ev->keyname, "Escape") || !strcmp(ev->keyname, "q")) {
+      ecore_main_loop_quit();
+   } else if (!strcmp(ev->keyname, "m")) {
+      if (!emotion_object_audio_mute_get(obj)) {
+         emotion_object_audio_mute_set(obj, 1);
+      } else {
+         emotion_object_audio_mute_set(obj, 0);
+      }
+   } else if (!strcmp(ev->keyname, "Down")) {
       double pos;
 
-      pos = emotion_object_position_get (obj);
-      emotion_object_position_set (obj, pos - 5);
-    }
-  else if (!strcmp (ev->keyname, "Up"))
-    {
+      pos = emotion_object_position_get(obj);
+      emotion_object_position_set(obj, pos - 5);
+   } else if (!strcmp(ev->keyname, "Up")) {
       double pos;
       int min, sec;
 
-      pos = emotion_object_position_get (obj);
-      emotion_object_position_set (obj, pos + 5);
-      pos = emotion_object_position_get (obj);
+      pos = emotion_object_position_get(obj);
+      emotion_object_position_set(obj, pos + 5);
+      pos = emotion_object_position_get(obj);
       min = pos / 60;
-      printf ("Position is: %d:00\n", min);
-    }
-  else if (!strcmp (ev->keyname, "Right"))
-    {
+      printf("Position is: %d:00\n", min);
+   } else if (!strcmp(ev->keyname, "Right")) {
       double pos;
 
-      pos = emotion_object_position_get (obj);
-      emotion_object_position_set (obj, pos + 10);
-    }
-  else if (!strcmp (ev->keyname, "Left"))
-    {
+      pos = emotion_object_position_get(obj);
+      emotion_object_position_set(obj, pos + 10);
+   } else if (!strcmp(ev->keyname, "Left")) {
       double pos;
 
-      pos = emotion_object_position_get (obj);
-      emotion_object_position_set (obj, pos - 10);
-    }
+      pos = emotion_object_position_get(obj);
+      emotion_object_position_set(obj, pos - 10);
+   }
 }
 
 
-EDJE_CALLBACK (quit)
+EDJE_CALLBACK(quit)
 {
-  ecore_main_loop_quit ();
+   ecore_main_loop_quit();
 }
 
-EDJE_CALLBACK (play)
+EDJE_CALLBACK(play)
 {
-  Envision *e = data;
-  printf ("DEBUG: Play\n");
-  emotion_object_play_set (e->gui.emotion, 1);
+   Envision *e = data;
+   printf("DEBUG: Play\n");
+   emotion_object_play_set(e->gui.emotion, 1);
 }
 
-EDJE_CALLBACK (pause)
+EDJE_CALLBACK(pause)
 {
-  Envision *e = data;
-  printf ("DEBUG: Pause\n");
-  emotion_object_play_set (e->gui.emotion, 0);
+   Envision *e = data;
+   printf("DEBUG: Pause\n");
+   emotion_object_play_set(e->gui.emotion, 0);
 }
 
-EDJE_CALLBACK (volume_raise)
+EDJE_CALLBACK(volume_raise)
 {
-  Envision *e = data;
-  double volume;
-  char vol_str[3];
+   Envision *e = data;
+   double volume;
+   char vol_str[3];
 
-  volume = emotion_object_audio_volume_get (e->gui.emotion);
-  volume = volume + 0.10;
-  emotion_object_audio_volume_set (e->gui.emotion, volume);
+   volume = emotion_object_audio_volume_get(e->gui.emotion);
+   volume = volume + 0.10;
+   emotion_object_audio_volume_set(e->gui.emotion, volume);
 
-  sprintf (vol_str, "%2.0f", volume * 100);
-  edje_object_part_text_set (e->gui.edje, "vol_display_text", vol_str);
+   sprintf(vol_str, "%2.0f", volume * 100);
+   edje_object_part_text_set(e->gui.edje, "vol_display_text", vol_str);
 
-  evas_object_show (e->gui.edje);
+   evas_object_show(e->gui.edje);
 }
 
-EDJE_CALLBACK (volume_lower)
+EDJE_CALLBACK(volume_lower)
 {
-  Envision *e = data;
-  double volume;
-  char vol_str[3];
+   Envision *e = data;
+   double volume;
+   char vol_str[3];
 
-  volume = emotion_object_audio_volume_get (e->gui.emotion);
-  volume = volume - 0.10;
-  emotion_object_audio_volume_set (e->gui.emotion, volume);
+   volume = emotion_object_audio_volume_get(e->gui.emotion);
+   volume = volume - 0.10;
+   emotion_object_audio_volume_set(e->gui.emotion, volume);
 
-  sprintf (vol_str, "%2.0f", volume * 100);
-  edje_object_part_text_set (e->gui.edje, "vol_display_text", vol_str);
-  evas_object_show (e->gui.edje);
+   sprintf(vol_str, "%2.0f", volume * 100);
+   edje_object_part_text_set(e->gui.edje, "vol_display_text", vol_str);
+   evas_object_show(e->gui.edje);
 }
 
-EDJE_CALLBACK (seek_forward)
+EDJE_CALLBACK(seek_forward)
 {
-  Envision *e = data;
-  double pos;
+   Envision *e = data;
+   double pos;
 
-  pos = emotion_object_position_get (e->gui.emotion);
-  printf ("DEBUG: Position is %2f - Forward\n", pos);
-  emotion_object_position_set (e->gui.emotion, pos + 60);
+   pos = emotion_object_position_get(e->gui.emotion);
+   printf("DEBUG: Position is %2f - Forward\n", pos);
+   emotion_object_position_set(e->gui.emotion, pos + 60);
 }
 
-EDJE_CALLBACK (seek_backward)
+EDJE_CALLBACK(seek_backward)
 {
-  Envision *e = data;
-  double pos;
+   Envision *e = data;
+   double pos;
 
-  pos = emotion_object_position_get (e->gui.emotion);
-  printf ("DEBUG: Position is %2f - Backward\n", pos);
-  emotion_object_position_set (e->gui.emotion, pos - 60);
+   pos = emotion_object_position_get(e->gui.emotion);
+   printf("DEBUG: Position is %2f - Backward\n", pos);
+   emotion_object_position_set(e->gui.emotion, pos - 60);
 }
===================================================================
RCS file: /cvsroot/enlightenment/misc/envision/src/callbacks.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- callbacks.h	7 Sep 2004 07:37:46 -0000	1.3
+++ callbacks.h	8 Sep 2004 05:22:09 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * $Id: callbacks.h,v 1.3 2004/09/07 07:37:46 fletch3k Exp $
+ * $Id: callbacks.h,v 1.4 2004/09/08 05:22:09 xenith Exp $
  * vim:expandtab:ts=3:sts=3:sw=3
  */
 
@@ -16,18 +16,18 @@
          const char *emission, const char *source)
 
 // callbacks.c
-void canvas_resize (Ecore_Evas * ee);
-void update_timer (void *data, Evas_Object * obj, void *event_info);
-void callback_evas_keydown (void *data, Evas * e, Evas_Object * obj,
-			    void *event_info);
+void canvas_resize(Ecore_Evas * ee);
+void update_timer(void *data, Evas_Object * obj, void *event_info);
+void callback_evas_keydown(void *data, Evas * e, Evas_Object * obj,
+      void *event_info);
 
 // Edje Callbacks
-EDJE_CALLBACK (quit);
-EDJE_CALLBACK (play);
-EDJE_CALLBACK (pause);
-EDJE_CALLBACK (volume_raise);
-EDJE_CALLBACK (volume_lower);
-EDJE_CALLBACK (seek_forward);
-EDJE_CALLBACK (seek_backward);
+EDJE_CALLBACK(quit);
+EDJE_CALLBACK(play);
+EDJE_CALLBACK(pause);
+EDJE_CALLBACK(volume_raise);
+EDJE_CALLBACK(volume_lower);
+EDJE_CALLBACK(seek_forward);
+EDJE_CALLBACK(seek_backward);
 
 #endif /* __CALLBACKS_H */
===================================================================
RCS file: /cvsroot/enlightenment/misc/envision/src/envision.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- envision.c	7 Sep 2004 07:37:46 -0000	1.14
+++ envision.c	8 Sep 2004 05:22:09 -0000	1.15
@@ -1,5 +1,5 @@
 /*
- * $Id: envision.c,v 1.14 2004/09/07 07:37:46 fletch3k Exp $
+ * $Id: envision.c,v 1.15 2004/09/08 05:22:09 xenith Exp $
  * vim:expandtab:ts=3:sts=3:sw=3
  */
 
@@ -8,128 +8,126 @@
 #include "callbacks.h"
 
 Envision *
-envision_new ()
+envision_new()
 {
-  return calloc (1, sizeof (Envision));
+   return calloc(1, sizeof (Envision));
 }
 
 void
-envision_delete (Envision * e)
+envision_delete(Envision * e)
 {
-  free (e);
+   free(e);
 }
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
-  Envision *e = NULL;
-  double volume, vid_len;
-  char vol_str[3];
-  Evas_Coord minw, minh, w, h;
-  char *videofile = NULL;
-
-  e = envision_new ();
-  e->config.width = 400;
-  e->config.height = 400;
-  e->config.engine = NULL;
-
-  /*  Configuration  */
-
-  if (argc > 0 && argv[1] != NULL)
-    videofile = strdup (argv[1]);
-
-  if (envision_config_get (&e->config, argc, argv) == -1)
-    {
-      free (videofile);
-      envision_delete (e);
+   Envision *e = NULL;
+   double volume, vid_len;
+   char vol_str[3], *videofile = NULL;
+   Evas_Coord minw, minh, w, h;
+
+   e = envision_new();
+   e->config.width = 400;
+   e->config.height = 400;
+   e->config.engine = NULL;
+
+   /*  Configuration  */
+   if (argc > 0 && argv[1] != NULL) {
+      videofile = strdup(argv[1]);
+   }
+
+   if (envision_config_get(&e->config, argc, argv) == -1) {
+      free(videofile);
+      envision_delete(e);
       return (0);
-    }
+   }
 
-  // Initialization
-  ecore_init ();
-  ecore_evas_init ();
-  edje_init ();
-
-
-  // Setup evas canvas
-  e->gui.ee = ecore_evas_software_x11_new (NULL, 0, 0, 0, e->config.width,
-					   e->config.height);
-  ecore_evas_title_set (e->gui.ee, "Envision Media Player");
-  ecore_evas_name_class_set (e->gui.ee, "envision", "Envision");
-  ecore_evas_borderless_set (e->gui.ee, 1);
-  ecore_evas_shaped_set (e->gui.ee, 1);
-  ecore_evas_show (e->gui.ee);
-  e->gui.evas = ecore_evas_get (e->gui.ee);
-
-
-  // Setup edje objects
-  e->gui.edje = edje_object_add (e->gui.evas);
-  edje_object_file_set (e->gui.edje, DATA_DIR "/themes/trakvision.eet",
-			"envision");
-  evas_object_move (e->gui.edje, 0, 0);
-  edje_object_size_min_get (e->gui.edje, &minw, &minh);
-  ecore_evas_resize (e->gui.ee, (int) minw, (int) minh);
-  evas_object_show (e->gui.edje);
-
-
-  // Setup emotion objects
-  e->gui.emotion = emotion_object_add (e->gui.evas);
-  emotion_object_file_set (e->gui.emotion, videofile);
-  emotion_object_size_get (e->gui.emotion, &w, &h);
-
-  // Trakvision: 106 25
-  ecore_evas_resize (e->gui.ee, w + 25, h + 106);	// Resize EVAS
-  evas_object_resize (e->gui.edje, w + 25, h + 106);	// Resize Edje
-  evas_object_resize (e->gui.emotion, w, h);	// Resize Video
-
-  evas_object_focus_set (e->gui.emotion, 1);
-  edje_object_part_swallow (e->gui.edje, "swallow", e->gui.emotion);
-  evas_object_show (e->gui.emotion);
-
-  printf ("Emotion: Playing - %s  Length: %d\n",
-	  argv[1], (double) emotion_object_play_length_get (e->gui.emotion));
-  emotion_object_play_set (e->gui.emotion, 1);
-  evas_object_name_set (e->gui.emotion, "emotion");
-
-
-  /* EDJE STUFF */
-  /* Get and Display the volume */
-  volume = emotion_object_audio_volume_get (e->gui.emotion);
-  printf ("DEBUG: Volume is: %0f\n", volume * 100);
-  sprintf (vol_str, "%2.0f", volume * 100);
-  edje_object_part_text_set (e->gui.edje, "vol_display_text", vol_str);
-  edje_object_part_text_set (e->gui.edje, "video_name", argv[1]);
-  vid_len = emotion_object_play_length_get (e->gui.emotion);
-  evas_object_name_set (e->gui.edje, "edje");
-
-
-  /* Callbacks */
-  ecore_evas_callback_resize_set (e->gui.ee, canvas_resize);
-  evas_object_event_callback_add (e->gui.emotion, EVAS_CALLBACK_KEY_DOWN,
-				  callback_evas_keydown, NULL);
-  evas_object_smart_callback_add (e->gui.emotion, "frame_decode",
-				  update_timer, e);
-  edje_object_signal_callback_add (e->gui.edje, "VOL_INCR", "vol_incr_button",
-				   callback_edje_volume_raise, e);
-  edje_object_signal_callback_add (e->gui.edje, "VOL_DECR", "vol_decr_button",
-				   callback_edje_volume_lower, e);
-  edje_object_signal_callback_add (e->gui.edje, "QUIT", "quit",
-				   callback_edje_quit, NULL);
-  edje_object_signal_callback_add (e->gui.edje, "SEEK_BACK",
-				   "seekback_button",
-				   callback_edje_seek_backward, e);
-  edje_object_signal_callback_add (e->gui.edje, "SEEK_FORWARD",
-				   "seekforward_button",
-				   callback_edje_seek_forward, e);
-  edje_object_signal_callback_add (e->gui.edje, "PAUSE", "pause_button",
-				   callback_edje_pause, e);
-  edje_object_signal_callback_add (e->gui.edje, "PLAY", "play_button",
-				   callback_edje_play, e);
-
-  // Begin the program
-  ecore_main_loop_begin ();
-
-  envision_delete (e);
-
-  return 0;
+   // Initialization
+   ecore_init ();
+   ecore_evas_init ();
+   edje_init ();
+
+
+   // Setup evas canvas
+   e->gui.ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, e->config.width,
+         e->config.height);
+   ecore_evas_title_set(e->gui.ee, "Envision Media Player");
+   ecore_evas_name_class_set(e->gui.ee, "envision", "Envision");
+   ecore_evas_borderless_set(e->gui.ee, 1);
+   ecore_evas_shaped_set(e->gui.ee, 1);
+   ecore_evas_show(e->gui.ee);
+   e->gui.evas = ecore_evas_get(e->gui.ee);
+
+
+   // Setup edje objects
+   e->gui.edje = edje_object_add(e->gui.evas);
+   edje_object_file_set(e->gui.edje, DATA_DIR "/themes/trakvision.eet",
+         "envision");
+   evas_object_move(e->gui.edje, 0, 0);
+   edje_object_size_min_get(e->gui.edje, &minw, &minh);
+   ecore_evas_resize(e->gui.ee, (int)minw, (int)minh);
+   evas_object_name_set(e->gui.edje, "edje");
+   evas_object_show(e->gui.edje);
+
+
+   // Setup emotion objects
+   e->gui.emotion = emotion_object_add(e->gui.evas);
+   emotion_object_file_set(e->gui.emotion, videofile);
+   emotion_object_size_get(e->gui.emotion, &w, &h);
+   evas_object_name_set(e->gui.emotion, "emotion");
+
+
+   // Trakvision: 106 25
+   ecore_evas_resize(e->gui.ee, w+25, h+106);	// Resize EVAS
+   evas_object_resize(e->gui.edje, w+25, h+106);	// Resize Edje
+   evas_object_resize(e->gui.emotion, w, h);	// Resize Video
+   evas_object_focus_set(e->gui.emotion, 1);
+   edje_object_part_swallow(e->gui.edje, "swallow", e->gui.emotion);
+   evas_object_show(e->gui.emotion);
+
+   printf("Emotion: Playing - %s  Length: %d\n", argv[1],
+         (double)emotion_object_play_length_get(e->gui.emotion));
+   emotion_object_play_set(e->gui.emotion, 1);
+
+
+   /* EDJE STUFF */
+   /* Get and Display the volume */
+   volume = emotion_object_audio_volume_get(e->gui.emotion);
+   printf("DEBUG: Volume is: %0f\n", volume * 100);
+   sprintf(vol_str, "%2.0f", volume * 100);
+   edje_object_part_text_set(e->gui.edje, "vol_display_text", vol_str);
+   edje_object_part_text_set(e->gui.edje, "video_name", argv[1]);
+   vid_len = emotion_object_play_length_get(e->gui.emotion);
+
+
+   /* Callbacks */
+   ecore_evas_callback_resize_set(e->gui.ee, canvas_resize);
+   evas_object_event_callback_add(e->gui.emotion, EVAS_CALLBACK_KEY_DOWN,
+         callback_evas_keydown, NULL);
+   evas_object_smart_callback_add(e->gui.emotion, "frame_decode",
+         update_timer, e);
+   edje_object_signal_callback_add(e->gui.edje, "VOL_INCR", "vol_incr_button",
+         callback_edje_volume_raise, e);
+   edje_object_signal_callback_add(e->gui.edje, "VOL_DECR", "vol_decr_button",
+         callback_edje_volume_lower, e);
+   edje_object_signal_callback_add(e->gui.edje, "QUIT", "quit",
+         callback_edje_quit, NULL);
+   edje_object_signal_callback_add(e->gui.edje, "SEEK_BACK",
+         "seekback_button", callback_edje_seek_backward, e);
+   edje_object_signal_callback_add(e->gui.edje, "SEEK_FORWARD",
+         "seekforward_button", callback_edje_seek_forward, e);
+   edje_object_signal_callback_add(e->gui.edje, "PAUSE", "pause_button",
+         callback_edje_pause, e);
+   edje_object_signal_callback_add(e->gui.edje, "PLAY", "play_button",
+         callback_edje_play, e);
+
+
+   // Begin the program
+   ecore_main_loop_begin();
+
+
+   // Program ends
+   envision_delete(e);
+   return 0;
 }
===================================================================
RCS file: /cvsroot/enlightenment/misc/envision/src/envision.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- envision.h	7 Sep 2004 07:37:46 -0000	1.5
+++ envision.h	8 Sep 2004 05:22:09 -0000	1.6
@@ -1,5 +1,5 @@
 /*
- * $Id: envision.h,v 1.5 2004/09/07 07:37:46 fletch3k Exp $
+ * $Id: envision.h,v 1.6 2004/09/08 05:22:09 xenith Exp $
  * vim:expandtab:ts=3:sts=3:sw=3
  */
 
@@ -11,30 +11,27 @@
 #include <Emotion.h>
 #include <Edje.h>
 
-typedef struct
-{
-  char *engine;
-  int width;
-  int height;
+typedef struct {
+   char *engine;
+   int width;
+   int height;
 } Config;
 
-typedef struct
-{
-  Ecore_Evas *ee;
-  Evas *evas;
-  Evas_Object *edje;
-  Evas_Object *emotion;
+typedef struct {
+   Ecore_Evas *ee;
+   Evas *evas;
+   Evas_Object *edje;
+   Evas_Object *emotion;
 } Gui;
 
-typedef struct
-{
-  Evas_List *playlist;
-  Gui gui;
-  Config config;
+typedef struct {
+   Evas_List *playlist;
+   Gui gui;
+   Config config;
 } Envision;
 
 // envision.c
-Envision *envision_new ();
-void envision_delete (Envision * e);
+Envision *envision_new();
+void envision_delete(Envision * e);
 
 #endif /* __ENVISION_H */