Enlightenment CVS committal

Author  : lok
Project : e17
Module  : proto

Dir     : e17/proto/emphasis/src/bin


Modified Files:
        emphasis.h emphasis_callbacks.c emphasis_mpc.c emphasis_mpc.h 
        emphasis_player.c 


Log Message:
I hate auto-foo

===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- emphasis.h  20 Aug 2006 22:48:49 -0000      1.5
+++ emphasis.h  21 Aug 2006 14:58:50 -0000      1.6
@@ -8,7 +8,6 @@
 #include "config.h"
 
 #include <libmpd/libmpd.h>
-#include <libmpd/libmpd-internal.h>
 
 #include <Ecore.h>
 #include <Evas.h>
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_callbacks.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- emphasis_callbacks.c        20 Aug 2006 22:48:49 -0000      1.9
+++ emphasis_callbacks.c        21 Aug 2006 14:58:50 -0000      1.10
@@ -1013,6 +1013,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;
   
@@ -1033,12 +1034,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;
@@ -1056,12 +1061,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;
@@ -1074,6 +1083,9 @@
 
   mpc_delete_playlist(playlist_name);
   emphasis_pls_list_init(player);
+#else
+  UNUSED(data);
+#endif
 }
 
 void
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_mpc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- emphasis_mpc.c      21 Aug 2006 01:04:41 -0000      1.8
+++ emphasis_mpc.c      21 Aug 2006 14:58:50 -0000      1.9
@@ -484,6 +484,7 @@
 Evas_List *
 mpc_list_playlists(void)
 {
+#if defined(LIBMPD_0_12_4)
   MpdData *data;
   Evas_List *list;
 
@@ -492,19 +493,27 @@
 
   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;
   
-  data = mpd_database_get_pls_content (mo, playlist_name);
+  data = mpd_database_get_playlist_content(mo, playlist_name);
   list = convert_mpd_data(data);
 
   mpd_data_free(data);
   return list;
+#else
+  UNUSED(playlist_name);
+  return NULL;
+#endif
 }
 
 void
@@ -525,6 +534,7 @@
 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);
@@ -532,25 +542,29 @@
     {
       fprintf(stderr, "An error occur during the playlist deleting\n");
     }
+#else
+  UNUSED(playlist_name);
+#endif
 }
 
-MpdData *mpd_database_list_playlist()
+#if defined(LIBMPD_0_12_4)
+MpdData *mpd_database_list_playlist(MpdObj *mi)
 {
        MpdData *data = NULL;
        mpd_InfoEntity *ent = NULL;
 
-       if(!mpd_check_connected(mo))
+       if(!mpd_check_connected(mi))
        {
                return NULL;
        }
-       if(mpd_lock_conn(mo))
+       if(mpd_lock_conn(mi))
        {
                return NULL;
        }
 
-       mpd_sendLsInfoCommand(mo->connection, "");
+       mpd_sendLsInfoCommand(mi->connection, "");
 
-       while((ent = mpd_getNextInfoEntity(mo->connection))) 
+       while((ent = mpd_getNextInfoEntity(mi->connection))) 
        {
                if(ent->type == MPD_INFO_ENTITY_TYPE_PLAYLISTFILE) 
                {
@@ -562,64 +576,8 @@
                mpd_freeInfoEntity(ent);
        }
 
-       mpd_finishCommand(mo->connection);
-
-       mpd_unlock_conn(mo);
-       if(data == NULL)
-       {
-               return NULL;
-       }
-       return mpd_data_get_first(data);
-}
-
-MpdData *mpd_database_get_pls_content(MpdObj *mi,char *playlist)
-{
-       MpdData *data = NULL;
-       mpd_InfoEntity *ent = NULL;
-       if(!mpd_check_connected(mi))
-       {
-               return NULL;
-       }
-       if(!mpd_server_check_version(mi, 0,12,0))
-       {
-               return NULL;
-       }
-       if(mpd_server_check_command_allowed(mi, "listplaylistinfo") != 
MPD_SERVER_COMMAND_ALLOWED)
-       {
-               return NULL;
-       }
-       if(mpd_lock_conn(mi))
-       {
-               return NULL;
-       }
-       mpd_sendListPlaylistInfoCommand(mi->connection, playlist);
-       while (( ent = mpd_getNextInfoEntity(mi->connection)) != NULL)
-       {
-               data = mpd_new_data_struct_append( data );
-               if(ent->type == MPD_INFO_ENTITY_TYPE_DIRECTORY)
-               {
-                       data->type = MPD_DATA_TYPE_DIRECTORY;
-                       data->directory = ent->info.directory->path;
-                       ent->info.directory->path = NULL;
-               }
-               else if (ent->type == MPD_INFO_ENTITY_TYPE_SONG)
-               {
-                       data->type = MPD_DATA_TYPE_SONG;
-                       data->song = ent->info.song;
-                       ent->info.song = NULL;
-               }
-               else if (ent->type == MPD_INFO_ENTITY_TYPE_PLAYLISTFILE)
-               {
-                       data->type = MPD_DATA_TYPE_PLAYLIST;
-                       data->playlist = ent->info.playlistFile->path;
-                       ent->info.playlistFile->path = NULL;
-               }
-
-               mpd_freeInfoEntity(ent);
-       }
        mpd_finishCommand(mi->connection);
 
-       /* unlock */
        mpd_unlock_conn(mi);
        if(data == NULL)
        {
@@ -627,3 +585,5 @@
        }
        return mpd_data_get_first(data);
 }
+#endif
+
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_mpc.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- emphasis_mpc.h      21 Aug 2006 01:04:41 -0000      1.6
+++ emphasis_mpc.h      21 Aug 2006 14:58:50 -0000      1.7
@@ -53,9 +53,10 @@
 void mpc_load_playlist(char *playlist_name);
 void mpc_delete_playlist(char *playlist_name);
 
-/* TEMP */
-MpdData *mpd_database_list_playlist();
-MpdData *mpd_database_get_pls_content(MpdObj *mi,char *playlist);
+#if defined(LIBMPD_0_12_4)
+#include <libmpd/libmpd-internal.h>
+MpdData *mpd_database_list_playlist(MpdObj *mi);
+#endif
 /** @} */
 
 #endif /* EMPHASIS_MPC_H_ */
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_player.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- emphasis_player.c   20 Aug 2006 22:48:49 -0000      1.2
+++ emphasis_player.c   21 Aug 2006 14:58:50 -0000      1.3
@@ -1,26 +1,6 @@
 #include "emphasis.h"
 #include "emphasis_player.h"
 
-/* XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX */
-#ifndef EMPHASIS_LOCAL_PATH
-
-# if   defined(__lok__)
-#   define EMPHASIS_LOCAL_PATH "/home/lok/projects/"
-# elif defined(__any__)
-#   define EMPHASIS_LOCAL_PATH "./"
-# elif defined(__aji__)
-#   define EMPHASIS_LOCAL_PATH "/home/aji/src/"
-# else
-#   define EMPHASIS_LOCAL_PATH "./"
-# endif
-
-#endif
-
-#undef ICON_TEST
-#define ICON_TEST "emphasis/src/pict/haricot_eap-test3.png"
-/* XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX */
-
-
 #undef  EN_VAR_GET
 #define EN_VAR_GET(en,root,id) \
  (root)->small.id=ENHANCE_VAR_GET(en,"small_"#id);\



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