Enlightenment CVS committal

Author  : moom16
Project : e17
Module  : apps/eclair

Dir     : e17/apps/eclair/src


Modified Files:
        eclair_callbacks.c eclair_callbacks.h eclair_playlist.c 
        eclair_window.c 


Log Message:
* The interface can now enable or disable shuffling
* [eclair_wsz2edj] Shuffle and repeat buttons now works (even if the 
repeat feature is still not supported by eclair)

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_callbacks.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- eclair_callbacks.c  2 Jul 2005 23:25:45 -0000       1.17
+++ eclair_callbacks.c  3 Jul 2005 11:01:08 -0000       1.18
@@ -348,6 +348,20 @@
    eclair_stop(data);
 }
 
+//Called when user enables or disables shuffling
+void eclair_shuffle_cb(void *data, Evas_Object *edje_object, const char 
*emission, const char *source)
+{
+   Eclair *eclair;
+
+   if (!(eclair = data))
+      return;
+
+   if (strcmp(emission, "eclair_shuffle_enable") == 0)
+      eclair_playlist_set_shuffle(&eclair->playlist, 1);
+   else
+      eclair_playlist_set_shuffle(&eclair->playlist, 0);
+}
+
 //Called when the user clicks of the "load playlist" button  
 void eclair_playlist_load_cb(void *data, Evas_Object *edje_object, const char 
*emission, const char *source)
 {
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_callbacks.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- eclair_callbacks.h  2 Jul 2005 23:25:45 -0000       1.9
+++ eclair_callbacks.h  3 Jul 2005 11:01:08 -0000       1.10
@@ -25,6 +25,7 @@
 void eclair_stop_cb(void *data, Evas_Object *edje_object, const char 
*emission, const char *source);
 void eclair_prev_cb(void *data, Evas_Object *edje_object, const char 
*emission, const char *source);
 void eclair_next_cb(void *data, Evas_Object *edje_object, const char 
*emission, const char *source);
+void eclair_shuffle_cb(void *data, Evas_Object *edje_object, const char 
*emission, const char *source);
 void eclair_playlist_load_cb(void *data, Evas_Object *edje_object, const char 
*emission, const char *source);
 void eclair_playlist_save_cb(void *data, Evas_Object *edje_object, const char 
*emission, const char *source);
 void eclair_remove_all_cb(void *data, Evas_Object *edje_object, const char 
*emission, const char *source);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_playlist.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- eclair_playlist.c   10 Jun 2005 21:22:31 -0000      1.16
+++ eclair_playlist.c   3 Jul 2005 11:01:08 -0000       1.17
@@ -13,6 +13,7 @@
 #include "eclair_cover.h"
 #include "eclair_callbacks.h"
 #include "eclair_utils.h"
+#include "eclair_config.h"
 
 #define MAX_PATH_LEN 1024
 
@@ -21,6 +22,8 @@
 //Initialize the playlist
 void eclair_playlist_init(Eclair_Playlist *playlist, Eclair *eclair)
 {
+   int shuffle;
+
    if (!playlist)
       return;
 
@@ -32,6 +35,9 @@
    playlist->repeat = 0;
    playlist->eclair = eclair;
    playlist->media_files_destructor_timer = ecore_timer_add(0.05, 
eclair_playlist_media_files_destructor, playlist);
+
+   if (eclair && eclair_config_get_prop_int(&eclair->config, "suffle", 
"enabled", &shuffle))
+      eclair_playlist_set_shuffle(playlist, 1);
 }
 
 //Shutdown the playlist
@@ -52,8 +58,12 @@
    playlist->removed_media_files = 
evas_list_free(playlist->removed_media_files);
    playlist->current = NULL;
 
-   if (playlist->eclair && playlist->eclair->playlist_container)
-      eclair_playlist_container_update(playlist->eclair->playlist_container);
+   if (playlist->eclair)
+   {
+      eclair_config_set_prop_int(&playlist->eclair->config, "suffle", 
"enabled", playlist->shuffle);
+      if (playlist->eclair->playlist_container)
+         
eclair_playlist_container_update(playlist->eclair->playlist_container);
+   }
 }
 
 //Set the shuffle mode
@@ -66,9 +76,13 @@
    {
       playlist->shuffle = 1;
       eclair_playlist_reset_shuffle_list(playlist);
+      eclair_send_signal_to_all_windows(playlist->eclair, 
"signal_shuffle_enabled");
    }
    else
+   {
       playlist->shuffle = 0;
+      eclair_send_signal_to_all_windows(playlist->eclair, 
"signal_shuffle_disabled");
+   }
 }
 
 //Reset the shuffle list (should be called each time items are added or 
removed from the playlist)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_window.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eclair_window.c     2 Jul 2005 23:25:45 -0000       1.2
+++ eclair_window.c     3 Jul 2005 11:01:09 -0000       1.3
@@ -189,6 +189,8 @@
    edje_object_signal_callback_add(window->edje_object, 
"eclair_playlist_scroll_down_stop", "*", eclair_playlist_container_scroll_cb, 
eclair);
    edje_object_signal_callback_add(window->edje_object, 
"eclair_playlist_scroll_up_start", "*", eclair_playlist_container_scroll_cb, 
eclair);
    edje_object_signal_callback_add(window->edje_object, 
"eclair_playlist_scroll_up_stop", "*", eclair_playlist_container_scroll_cb, 
eclair);
+   edje_object_signal_callback_add(window->edje_object, 
"eclair_shuffle_enable", "*", eclair_shuffle_cb, eclair);
+   edje_object_signal_callback_add(window->edje_object, 
"eclair_shuffle_disable", "*", eclair_shuffle_cb, eclair);
    if (window->window_name)
    {
       signal_name = malloc(strlen("eclair_") + strlen(window->window_name) + 
strlen("_close") + 1);




-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to