Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/emphasis/src/bin
Modified Files:
emphasis_callbacks.c emphasis_callbacks.h emphasis_gui.c
emphasis_mpc.c emphasis_mpc.h
Log Message:
Delete option added to the menu.
Volume images are now clickable.
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_callbacks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- emphasis_callbacks.c 29 Jun 2006 15:41:06 -0000 1.2
+++ emphasis_callbacks.c 2 Jul 2006 01:51:56 -0000 1.3
@@ -573,7 +573,7 @@
* @brief Delete all the selected item from the playlist
*/
void
-cb_playlist_delete(Etk_Object *object, Etk_Event_Mouse_Up_Down *event, void
*data)
+cb_playlist_delete(Etk_Object *object, void *data)
{
Emphasis_Gui *gui;
Etk_Tree_Row *row;
@@ -583,10 +583,25 @@
gui = (Emphasis_Gui *)data;
rowlist = etk_tree_selected_rows_get(ETK_TREE(gui->tree_pls));
- row = etk_tree_first_row_get(ETK_TREE(gui->tree_pls));
list = convert_rowlist_in_playlist_with_id(rowlist);
mpc_playlist_delete(list);
+}
+
+void
+cb_vol_image_clicked(Etk_Object *object, Etk_Event_Mouse_Up_Down *event, void
*data)
+{
+ Emphasis_Gui *gui;
+
+ gui = data;
+ if (ETK_WIDGET(object) == gui->vol_imagel)
+ {
+ mpc_change_vol(mpc_get_vol()-5);
+ }
+ else if (ETK_WIDGET(object) == gui->vol_imager)
+ {
+ mpc_change_vol(mpc_get_vol()+5);
+ }
}
/**
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_callbacks.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- emphasis_callbacks.h 6 Jun 2006 11:22:15 -0000 1.1
+++ emphasis_callbacks.h 2 Jul 2006 01:51:56 -0000 1.2
@@ -32,8 +32,9 @@
void cb_pls_contextual_menu(Etk_Object *object, Etk_Event_Mouse_Up_Down
*event_info, void *data);
void cb_playlist_clear(Etk_Object *object, Etk_Event_Mouse_Up_Down *event,
void *data);
void cb_pls_bindings_key(Etk_Object *object, Etk_Event_Key_Up_Down *event,
void *data);
-void cb_playlist_delete(Etk_Object *object, Etk_Event_Mouse_Up_Down *event,
void *data);
+void cb_playlist_delete(Etk_Object *object, void *data);
+void cb_vol_image_clicked(Etk_Object *object, Etk_Event_Mouse_Up_Down *event,
void *data);
void cb_vol_slider_value_changed(Etk_Object *object, double value, void *data);
void cb_database_update(Etk_Object *object, Etk_Event_Mouse_Up_Down *event,
void *data);
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_gui.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- emphasis_gui.c 29 Jun 2006 15:41:06 -0000 1.2
+++ emphasis_gui.c 2 Jul 2006 01:51:56 -0000 1.3
@@ -70,6 +70,8 @@
etk_box_pack_start(ETK_BOX(gui->vol_hbox), gui->vol_imager, ETK_FALSE,
ETK_FALSE, 5);
etk_box_pack_start(ETK_BOX(gui->vbox_controls), gui->vol_hbox,
ETK_TRUE, ETK_TRUE, 5);
etk_signal_connect("value_changed", ETK_OBJECT(gui->vol_slider),
ETK_CALLBACK(cb_vol_slider_value_changed), NULL);
+ etk_signal_connect("mouse_down", ETK_OBJECT(gui->vol_imagel),
ETK_CALLBACK(cb_vol_image_clicked), gui);
+ etk_signal_connect("mouse_down", ETK_OBJECT(gui->vol_imager),
ETK_CALLBACK(cb_vol_image_clicked), gui);
/* Repeat/Random checkbox setup */
gui->hbox_modes = etk_hbox_new(ETK_FALSE, 5);
@@ -221,6 +223,7 @@
Etk_Widget *menu_item, *radio_item=NULL, *menu;
emphasis_menu_append(gui->menu, "clear", ETK_STOCK_EDIT_CUT,
cb_playlist_clear, NULL,
+ "delete", NULL, cb_playlist_delete, gui,
/* "config", ETK_STOCK_PREFERENCES_SYSTEM,
cb_config_show, gui, */
"Open a file", ETK_STOCK_DOCUMENT_OPEN,
NULL, NULL,
NULL);
@@ -230,7 +233,6 @@
radio_item = etk_menu_item_radio_new_with_label_from_widget("small",
ETK_MENU_ITEM_RADIO(radio_item));
etk_menu_shell_append(ETK_MENU_SHELL(gui->menu),
ETK_MENU_ITEM(radio_item));
etk_signal_connect("activated", ETK_OBJECT(radio_item),
ETK_CALLBACK(cb_switch_small), gui);
-
etk_signal_connect("mouse_down", ETK_OBJECT(gui->window),
ETK_CALLBACK(cb_pls_contextual_menu),
ETK_MENU(gui->menu));
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_mpc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- emphasis_mpc.c 29 Jun 2006 15:41:06 -0000 1.2
+++ emphasis_mpc.c 2 Jul 2006 01:51:56 -0000 1.3
@@ -437,6 +437,15 @@
}
/**
+ * @brief Get mpd volume value
+ */
+int
+mpc_get_vol(void)
+{
+ return mpd_status_get_volume(mo);
+}
+
+/**
* @brief Changed mpd volume level
*/
void
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_mpc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- emphasis_mpc.h 29 Jun 2006 15:41:06 -0000 1.2
+++ emphasis_mpc.h 2 Jul 2006 01:51:56 -0000 1.3
@@ -42,6 +42,7 @@
void mpc_toggle_random(void);
void mpc_toggle_repeat(void);
+int mpc_get_vol(void);
void mpc_change_vol(int value);
void mpc_database_update(char *path);
void mpc_disconnect(void);
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
