Enlightenment CVS committal

Author  : captainigloo
Project : misc
Module  : enna

Dir     : misc/enna/src/bin


Modified Files:
        enna.c enna_bluetooth.c enna_reflection.c 


Log Message:
* Remove few debug infos
* Enable miniplayer selection in main menu
* Select music module at startup

===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna.c      14 Jan 2008 22:16:05 -0000      1.1
+++ enna.c      22 Jan 2008 19:05:02 -0000      1.2
@@ -59,6 +59,7 @@
 static void         _video_activate_cb(void *data, void *data2);
 static void         _photo_activate_cb(void *data, void *data2);
 static void         _playlist_activate_cb(void *data, void *data2);
+static void         _mediaplayer_activate_cb (void *data, void *data2);
 
 /* Functions */
 static int          enna_init(Enna * enna, int run_gl);
@@ -161,6 +162,17 @@
    enna_module_selected_name_set(enna->modules, "Playlist Module");
 }
 
+static void
+  _mediaplayer_activate_cb (void *data, void *data2)
+{
+   Enna *enna;
+   enna = (Enna *) data;
+
+   if (!enna)
+     return;
+   enna_module_selected_name_set (enna->modules, "MediaPlayer Module");
+}
+
 static int
 _device_add_event(void *data, int type, void *ev)
 {
@@ -351,9 +363,11 @@
    /* Create miniplayer menu */
    module_mediaplayer = enna_mediaplayer_add(enna->evas);
    enna->mediaplayer = module_mediaplayer;
-   enna_module_append(modules, module_mediaplayer, "MediaPlayer Module",
+   enna_module_append(modules, module_mediaplayer, "MediaPlayer Module", 
                      ENNA_MODULE_MEDIAPLAYER);
 
+   enna_mainmenu_append (mainmenu, NULL, _("MediaPlayer"), 1,
+                        _mediaplayer_activate_cb, NULL, enna, NULL);
    /* Create menus */
    config_module =
       enna_config_get_conf_value_or_default("tv_module", "used", "1");
@@ -421,7 +435,7 @@
 
    /* Select 1st module */
    enna_module_selected_name_set(modules, "Music Module");
-   enna_mainmenu_selected_set(mainmenu, 0);
+   enna_mainmenu_selected_set(mainmenu, 1);
 
    enna->mainmenu = mainmenu;
    enna_mainmenu_has_focus_set(mainmenu, 0);
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_bluetooth.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_bluetooth.c    14 Jan 2008 22:16:05 -0000      1.1
+++ enna_bluetooth.c    22 Jan 2008 19:05:02 -0000      1.2
@@ -54,8 +54,6 @@
 EAPI void
 enna_bluetooth_init()
 {
-
-   printf("bluetooth init\n");
    gconf_init(0, NULL, NULL);
 
    ecore_timer_add(30.0, enna_bluetooth_scan, NULL);
@@ -88,7 +86,7 @@
    sock = hci_open_dev(dev_id);
    if (dev_id < 0 || sock < 0)
      {
-       printf("Error : Unable to open Socket\n");
+       dbg("Error : Unable to open Socket\n");
        return NULL;
      }
 
@@ -99,7 +97,7 @@
 
    num_rsp = hci_inquiry(dev_id, length, max_rsp, NULL, &info, flags);
    if (num_rsp < 0)
-      printf("Error : hci_inquiry\n");
+      dbg("Error : hci_inquiry\n");
 
    for (i = 0; i < num_rsp; i++)
      {
@@ -108,13 +106,13 @@
        if (hci_read_remote_name
            (sock, &(info + i)->bdaddr, sizeof(name), name, 0) < 0)
           strcpy(name, "[unknown]");
-       printf("%s %s\n", addr, name);
+       dbg("%s %s\n", addr, name);
        if (!strcmp
            (addr,
             enna_config_get_conf_value_or_default("bluetooth", "device_addr",
                                                   "")))
          {
-            printf("device found : %s %s!!!\n", name, addr);
+            dbg("device found : %s %s!!!\n", name, addr);
             found = TRUE;
             break;
          }
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_reflection.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_reflection.c   14 Jan 2008 22:16:05 -0000      1.1
+++ enna_reflection.c   22 Jan 2008 19:05:02 -0000      1.2
@@ -264,7 +264,6 @@
    y = sd->y + ((sd->h - h) / 2);
 
    evas_object_image_file_get(sd->obj, &file, NULL);
-   dbg("file : %s\n", file);
 
    evas_object_image_load_size_set(sd->obj, w, w);
    evas_object_image_file_set(sd->obj, file, NULL);
@@ -286,7 +285,6 @@
 
    old_pixels = evas_object_image_data_get(sd->obj, 0);
    evas_object_image_size_get(sd->obj, &w, &h);
-   dbg("old_pixels\n");
 
    if (!old_pixels)
       return;
@@ -295,7 +293,6 @@
       free(sd->pixels);
 
    sd->pixels = malloc(sizeof(int) * w * h);
-   dbg("new pixels %dx%d %d %d\n", w, h, x, y);
 
    /* For each pixels decrease alpha after each line */
    alpha = 100;



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to