Enlightenment CVS committal
Author : lok
Project : e17
Module : apps/emphasis
Dir : e17/apps/emphasis/src/bin
Modified Files:
Makefile.am emphasis_callbacks.c emphasis_media.c
emphasis_mpc.c
Log Message:
Revert change on libmpd support.
Back to the libmpd >= 0.12.0 depedency.
===================================================================
RCS file: /cvs/e/e17/apps/emphasis/src/bin/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 9 Mar 2007 18:23:18 -0000 1.7
+++ Makefile.am 18 Mar 2007 17:18:17 -0000 1.8
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CFLAGS = \
--Wall -W -g -D_GNU_SOURCE @ECORE_CFLAGS@ @ETK_CFLAGS@ @ENHANCE_CFLAGS@
@libmpd_CFLAGS@ @XML2_CFLAGS@
+-Wall -W -g -D_GNU_SOURCE @ECORE_CFLAGS@ @ETK_CFLAGS@ @ENHANCE_CFLAGS@
@libmpd_CFLAGS@ @XML2_CFLAGS@ @libmpd_v_cflags@
bin_PROGRAMS = emphasis
===================================================================
RCS file: /cvs/e/e17/apps/emphasis/src/bin/emphasis_callbacks.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- emphasis_callbacks.c 14 Mar 2007 01:28:03 -0000 1.24
+++ emphasis_callbacks.c 18 Mar 2007 17:18:17 -0000 1.25
@@ -1212,6 +1212,7 @@
cb_media_pls_save_clicked(Etk_Object *object, void *data)
{
UNUSED(object);
+#if defined(LIBMPD_0_12_4)
Emphasis_Player_Gui *player;
Etk_Widget *entry;
@@ -1234,12 +1235,16 @@
etk_widget_focus(entry);
}
emphasis_pls_list_init(player);
+#else
+ UNUSED(data);
+#endif
}
void
cb_media_pls_load_clicked(Etk_Object *object, void *data)
{
UNUSED(object);
+#if defined(LIBMPD_0_12_4)
Emphasis_Player_Gui *player;
Etk_Tree_Col *col;
Etk_Tree_Row *row;
@@ -1259,12 +1264,16 @@
EMPHASIS_TRACK);
etk_tree_unselect_all(ETK_TREE(player->media.pls_content));
mpc_play_if_stopped();
+#else
+ UNUSED(data);
+#endif
}
void
cb_media_pls_del_clicked(Etk_Object *object, void *data)
{
UNUSED(object);
+#if defined(LIBMPD_0_12_4)
Emphasis_Player_Gui *player;
Etk_Tree_Col *col;
Etk_Tree_Row *row;
@@ -1278,6 +1287,9 @@
mpc_delete_playlist(playlist_name);
emphasis_pls_list_init(player);
+#else
+ UNUSED(data);
+#endif
}
void
@@ -1483,6 +1495,14 @@
}
return; /* no show/hide */
}
+ else if( event->widget.y <= 7 )
+ {
+ /* special sensible cover zone (top) */
+ double seek;
+ seek = (double) event->widget.x / (double) w;
+ mpc_seek(seek);
+ return; /* no show/hide */
+ }
win = player->small.ctr.window;
}
else
@@ -1514,7 +1534,7 @@
/* switch small<->tiny */
if(player->small.packed == ETK_TRUE)
{
- /* packing */
+ /* unpacking */
etk_widget_hide(player->small.window);
etk_container_add(ETK_CONTAINER(player->small.cov.window),
@@ -1523,15 +1543,16 @@
player->small.ctr.root);
etk_widget_size_request_set(player->small.cover,
- player->small.cover_size_w,
- player->small.cover_size_w);
+ 100, 100);
+ //player->small.cover_size_w,
+ //player->small.cover_size_w);
etk_widget_show(player->small.cov.window);
etk_widget_show(player->small.ctr.window);
}
else
{
- /* unpacking */
+ /* packing */
etk_widget_hide(player->small.cov.window);
etk_widget_hide(player->small.ctr.window);
===================================================================
RCS file: /cvs/e/e17/apps/emphasis/src/bin/emphasis_media.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- emphasis_media.c 9 Mar 2007 18:23:18 -0000 1.7
+++ emphasis_media.c 18 Mar 2007 17:18:17 -0000 1.8
@@ -256,9 +256,14 @@
pls_list = ETK_TREE(player->media.pls_list);
etk_tree_clear(pls_list);
+#if defined(LIBMPD_0_12_4)
emphasis_tree_mlib_append(pls_list,
(mpc_list_playlists()),
MPD_DATA_TYPE_PLAYLIST,
NULL);
+#else
+ etk_tree_append(pls_list, etk_tree_nth_col_get(pls_list, 0),
+ "You need libmpd 0.12.4 order to use mpd playlists", NULL);
+#endif
}
===================================================================
RCS file: /cvs/e/e17/apps/emphasis/src/bin/emphasis_mpc.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- emphasis_mpc.c 9 Mar 2007 18:23:18 -0000 1.16
+++ emphasis_mpc.c 18 Mar 2007 17:18:17 -0000 1.17
@@ -644,6 +644,7 @@
Evas_List *
mpc_list_playlists(void)
{
+#if defined(LIBMPD_0_12_4)
MpdData *data;
Evas_List *list;
@@ -652,11 +653,15 @@
mpd_data_free(data);
return list;
+#else
+ return NULL;
+#endif
}
Evas_List *
mpc_get_playlist_content(char *playlist_name)
{
+#if defined(LIBMPD_0_12_4)
MpdData *data;
Evas_List *list;
@@ -665,11 +670,15 @@
mpd_data_free(data);
return list;
+#else
+ return NULL;
+#endif
}
void
mpc_save_playlist(char *playlist_name)
{
+#if defined(LIBMPD_0_12_4)
int mpd_error;
mpd_error = mpd_database_save_playlist(mo, playlist_name);
@@ -680,11 +689,15 @@
fprintf(stderr, "A playlist with the same name already exist.\n");
}
}
+#else
+ UNUSED(playerlist_name)
+#endif
}
void
mpc_delete_playlist(char *playlist_name)
{
+#if defined(LIBMPD_0_12_4)
int mpd_error;
mpd_error = mpd_database_delete_playlist(mo, playlist_name);
@@ -692,6 +705,9 @@
{
fprintf(stderr, "An error occur during the playlist deleting\n");
}
+#else
+ UNUSED(playlist_name)
+#endif
}
MpdData *mpd_database_list_playlist(MpdObj *mi)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
