Enlightenment CVS committal

Author  : moom16
Project : e17
Module  : apps/eclair

Dir     : e17/apps/eclair/src


Modified Files:
        eclair.c eclair_callbacks.c eclair_dialogs.c eclair_playlist.c 
        eclair_private.h 


Log Message:
* Restoring the previous shuffle mode is fixed
* Fix the resize problem when pause and then re-play the media file
* Check the shuffle check_menu_item in the Gtk2 menu when shuffling is 
enabled by the edje interface

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- eclair.c    2 Jul 2005 23:25:45 -0000       1.24
+++ eclair.c    3 Jul 2005 15:51:06 -0000       1.25
@@ -54,6 +54,9 @@
    eclair->video_object = NULL;
    eclair->black_background = NULL;
    eclair->subtitles_object = NULL;
+   eclair->previous_video_width = 0;
+   eclair->previous_video_height = 0;
+   eclair->previous_video_ratio = 0.0;
    eclair->gui_window = NULL;
    eclair->cover = NULL;
    eclair->previous_cover = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_callbacks.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- eclair_callbacks.c  3 Jul 2005 11:01:08 -0000       1.18
+++ eclair_callbacks.c  3 Jul 2005 15:51:06 -0000       1.19
@@ -153,10 +153,18 @@
 
    emotion_object_size_get(eclair->video_object, &w, &h);
    ratio = emotion_object_ratio_get(eclair->video_object);
+
+   if (eclair->previous_video_width == w && eclair->previous_video_height == h 
&& eclair->previous_video_ratio == ratio)
+      return;
+
    if (ratio > 0.0)
       ecore_evas_resize(eclair->video_window, h * ratio, h);
    else
       ecore_evas_resize(eclair->video_window, w, h);
+
+   eclair->previous_video_width = w;
+   eclair->previous_video_height = h;
+   eclair->previous_video_ratio = ratio;
 }
 
 //Called when the video window is resized:
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_dialogs.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- eclair_dialogs.c    1 Jul 2005 14:25:39 -0000       1.12
+++ eclair_dialogs.c    3 Jul 2005 15:51:06 -0000       1.13
@@ -149,6 +149,10 @@
       dialogs_manager->should_open_search_window = FALSE;
    }
 
+   if (dialogs_manager->eclair)
+      
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(glade_xml_get_widget(dialogs_manager->menu_xml,
 "shuffle_mode1")),
+         dialogs_manager->eclair->playlist.shuffle);
+
    return 1;
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_playlist.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- eclair_playlist.c   3 Jul 2005 11:01:08 -0000       1.17
+++ eclair_playlist.c   3 Jul 2005 15:51:06 -0000       1.18
@@ -14,6 +14,7 @@
 #include "eclair_callbacks.h"
 #include "eclair_utils.h"
 #include "eclair_config.h"
+#include "eclair_dialogs.h"
 
 #define MAX_PATH_LEN 1024
 
@@ -36,7 +37,7 @@
    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))
+   if (eclair && eclair_config_get_prop_int(&eclair->config, "suffle", 
"enabled", &shuffle) && shuffle)
       eclair_playlist_set_shuffle(playlist, 1);
 }
 
@@ -69,20 +70,18 @@
 //Set the shuffle mode
 void eclair_playlist_set_shuffle(Eclair_Playlist *playlist, Evas_Bool shuffle)
 {
-   if (!playlist)
+   if (!playlist || !playlist->eclair)
       return;
 
    if (shuffle)
    {
-      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");
-   }
+
+   playlist->shuffle = shuffle;
 }
 
 //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_private.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- eclair_private.h    1 Jul 2005 14:25:40 -0000       1.21
+++ eclair_private.h    3 Jul 2005 15:51:06 -0000       1.22
@@ -269,6 +269,8 @@
    Evas_Object *subtitles_object;
    Eclair_Engine video_engine;
    pthread_t video_create_thread;
+   int previous_video_width, previous_video_height;
+   double previous_video_ratio;
 
    //Gui related vars
    Eclair_Window *gui_window;




-------------------------------------------------------
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