Enlightenment CVS committal

Author  : lok
Project : e17
Module  : proto

Dir     : e17/proto/emphasis/src/bin


Modified Files:
        emphasis_callbacks.c emphasis_callbacks.h 


Log Message:
Make compile

===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_callbacks.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- emphasis_callbacks.c        21 Aug 2006 14:58:50 -0000      1.10
+++ emphasis_callbacks.c        24 Aug 2006 23:18:25 -0000      1.11
@@ -162,7 +162,7 @@
  * @brief Seek in the song the same percent position than the progress bar 
click
  */
 void
-cb_seek_time(Etk_Object *object, Etk_Event_Mouse_Up_Down *event, void *data)
+cb_seek_time(Etk_Object *object, Etk_Event_Mouse_Down *event, void *data)
 {
   UNUSED(data)
   Etk_Widget *progress;
@@ -178,7 +178,7 @@
 
 void
 cb_vol_image_clicked(Etk_Object *object,
-                     Etk_Event_Mouse_Up_Down *event,
+                     Etk_Event_Mouse_Down *event,
                      void *data)
 {
   UNUSED(event);
@@ -521,7 +521,7 @@
  */
 void
 cb_tree_mlib_clicked(Etk_Object *object, Etk_Tree_Row *row,
-                     Etk_Event_Mouse_Up_Down *event, void *data)
+                     Etk_Event_Mouse_Down *event, void *data)
 {
   Emphasis_Player_Gui *player;
   Emphasis_Type et;
@@ -548,7 +548,7 @@
  */
 void
 cb_tree_pls_clicked(Etk_Object *object, Etk_Tree_Row *row,
-                    Etk_Event_Mouse_Up_Down *event, void *data)
+                    Etk_Event_Mouse_Down *event, void *data)
 {
   UNUSED(data)
   int id;
@@ -565,7 +565,7 @@
 }
 
 void
-cb_emphasis_bindings_key(Etk_Object *object, Etk_Event_Key_Up_Down *event,
+cb_emphasis_bindings_key(Etk_Object *object, Etk_Event_Key_Down *event,
                          void *data)
 {
   UNUSED(data)
@@ -606,7 +606,7 @@
  * @brief Fast find in mlib tree
  */
 void
-cb_mlib_bindings_key(Etk_Object *object, Etk_Event_Key_Up_Down *event,
+cb_mlib_bindings_key(Etk_Object *object, Etk_Event_Key_Down *event,
                      void *data)
 {
   Etk_Tree *tree;
@@ -622,7 +622,7 @@
   player = data;
 
   if (!strcmp(event->key, "a")
-      && evas_key_modifier_is_set(event->modifiers, "Control"))
+      && event->modifiers == ETK_MODIFIER_CTRL)
     {
       etk_tree_select_all(tree);
 
@@ -644,7 +644,7 @@
     }
 
   if (!strcmp(event->key, "Tab")
-      || evas_key_modifier_is_set(event->modifiers, "Control"))
+      || event->modifiers == ETK_MODIFIER_CTRL)
     return;
 
   col = etk_tree_nth_col_get(tree, 0);
@@ -727,7 +727,7 @@
  * @brief If right-clicked: popdown the contextual menu on the playlist
  */
 void
-cb_pls_contextual_menu(Etk_Object *object, Etk_Event_Mouse_Up_Down *event,
+cb_pls_contextual_menu(Etk_Object *object, Etk_Event_Mouse_Down *event,
                        void *data)
 {
   UNUSED(object)
@@ -745,7 +745,7 @@
  * @brief Clear the playlist
  */
 void
-cb_playlist_clear(Etk_Object *object, Etk_Event_Mouse_Up_Down *event,
+cb_playlist_clear(Etk_Object *object, Etk_Event_Mouse_Down *event,
                   void *data)
 {
   UNUSED(object)
@@ -759,7 +759,7 @@
  * @brief Callback function of bindings key on the playlist
  */
 void
-cb_pls_bindings_key(Etk_Object *object, Etk_Event_Key_Up_Down *event, 
+cb_pls_bindings_key(Etk_Object *object, Etk_Event_Key_Down *event, 
                     void *data)
 {
   UNUSED(object)
@@ -980,7 +980,7 @@
 
 void
 cb_media_pls_list_row_clicked(Etk_Object *object, Etk_Tree_Row *row, 
-                              Etk_Event_Mouse_Up_Down *event, void *data)
+                              Etk_Event_Mouse_Down *event, void *data)
 {
   Emphasis_Player_Gui *player;
   Etk_Tree *tree;
@@ -1089,7 +1089,7 @@
 }
 
 void
-cb_media_pls_save_key_down(Etk_Object *object, Etk_Event_Key_Up_Down *event,
+cb_media_pls_save_key_down(Etk_Object *object, Etk_Event_Key_Down *event,
                            void *data)
 {
   if (!strcmp(event->key, "Return"))
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_callbacks.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- emphasis_callbacks.h        20 Aug 2006 22:48:49 -0000      1.5
+++ emphasis_callbacks.h        24 Aug 2006 23:18:25 -0000      1.6
@@ -17,9 +17,9 @@
 void cb_toggle_repeat(Etk_Object *object, void *data);
 void cb_toggle_full(Etk_Object *object, void *data);
 void cb_toggle_media(Etk_Object *object, void *data);
-void cb_seek_time(Etk_Object *object, Etk_Event_Mouse_Up_Down *event,
+void cb_seek_time(Etk_Object *object, Etk_Event_Mouse_Down *event,
                   void *data);
-void cb_vol_image_clicked(Etk_Object *object, Etk_Event_Mouse_Up_Down *event, 
+void cb_vol_image_clicked(Etk_Object *object, Etk_Event_Mouse_Down *event, 
                           void *data);
 void cb_vol_slider_value_changed(Etk_Object *object, double value,
                                  void *data);
@@ -33,21 +33,21 @@
 void cb_drop_song(Etk_Object *object, void *event, void *data);
 
 void cb_tree_mlib_clicked(Etk_Object *object, Etk_Tree_Row *row,
-                          Etk_Event_Mouse_Up_Down *event, void *data);
+                          Etk_Event_Mouse_Down *event, void *data);
 void cb_tree_pls_clicked(Etk_Object *object, Etk_Tree_Row *row,
-                         Etk_Event_Mouse_Up_Down *event, void *data);
+                         Etk_Event_Mouse_Down *event, void *data);
 
-void cb_emphasis_bindings_key(Etk_Object *object, Etk_Event_Key_Up_Down 
*event, 
+void cb_emphasis_bindings_key(Etk_Object *object, Etk_Event_Key_Down *event, 
                               void *data);
-void cb_mlib_bindings_key(Etk_Object *object, Etk_Event_Key_Up_Down *event,
+void cb_mlib_bindings_key(Etk_Object *object, Etk_Event_Key_Down *event,
                           void *data);
 
 
-void cb_pls_contextual_menu(Etk_Object *object, Etk_Event_Mouse_Up_Down 
*event, 
+void cb_pls_contextual_menu(Etk_Object *object, Etk_Event_Mouse_Down *event, 
                             void *data);
-void cb_playlist_clear(Etk_Object *object, Etk_Event_Mouse_Up_Down *event,
+void cb_playlist_clear(Etk_Object *object, Etk_Event_Mouse_Down *event,
                        void *data);
-void cb_pls_bindings_key(Etk_Object *object, Etk_Event_Key_Up_Down *event,
+void cb_pls_bindings_key(Etk_Object *object, Etk_Event_Key_Down *event,
                          void *data);
 void cb_playlist_delete(Etk_Object *object, void *data);
 void cb_database_update(Etk_Object *object, void *data);
@@ -65,11 +65,11 @@
 Etk_Bool cb_config_hide(Etk_Object *object, void *data);
 
 void cb_media_pls_list_row_clicked(Etk_Object *object, Etk_Tree_Row *row, 
-                                   Etk_Event_Mouse_Up_Down *event, void *data);
+                                   Etk_Event_Mouse_Down *event, void *data);
 void cb_media_pls_save_clicked(Etk_Object *object, void *data);
 void cb_media_pls_load_clicked(Etk_Object *object, void *data);
 void cb_media_pls_del_clicked(Etk_Object *object, void *data);
 void cb_media_pls_save_key_down(Etk_Object *object, 
-                                Etk_Event_Key_Up_Down *event, void *data);
+                                Etk_Event_Key_Down *event, void *data);
 /** @} */
 #endif /* EMPHASIS_CALLBACKS_H_ */



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to