Changed directory layout (for future use of gettext)

git-svn-id: https://svn.musicpd.org/ncmpc/trunk@1342 09075e82-0dd4-0310-85a5-a0d7c8717e4f

1 files changed, 0 insertions, 359 deletions

diff --git a/mpc.c b/mpc.c
deleted file mode 100644
index 0a80af4dd..000000000
--- a/mpc.c
+++ /dev/null
@@ -1,359 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-#include <string.h>
-#include <glib.h>
-
-#include "config.h"
-#include "support.h"
-#include "libmpdclient.h"
-#include "mpc.h"
-#include "options.h"
-
-#define MAX_SONG_LENGTH 1024
-
-#ifdef DEBUG
-#define D(x) x
-#else
-#define D(x)
-#endif
-
-int 
-mpc_close(mpd_client_t *c)
-{
-  if( c->connection )
-    mpd_closeConnection(c->connection);
-  if( c->cwd )
-    g_free( c->cwd );
-  
-  return 0;
-}
-
-mpd_client_t *
-mpc_connect(char *host, int port, char *password)
-{
-  mpd_Connection *connection;
-  mpd_client_t *c;
-
-  connection =  mpd_newConnection(host, port, 10);
-  if( connection==NULL )
-    {
-      fprintf(stderr, "mpd_newConnection to %s:%d failed!\n", host, port);
-      exit(EXIT_FAILURE);
-    }
-  
-  c = g_malloc(sizeof(mpd_client_t));
-  memset(c, 0, sizeof(mpd_client_t));
-  c->connection = connection;
-  c->cwd = g_strdup("");
-
-  if( password )
-    {
-      mpd_sendPasswordCommand(connection, password);
-      mpd_finishCommand(connection);
-    }
-
-  return c;
-}
-
-int
-mpc_reconnect(mpd_client_t *c, char *host, int port, char *password)
-{
-  mpd_Connection *connection;
-
-  connection =  mpd_newConnection(host, port, 10);
-  if( connection==NULL )
-    return -1;
-  if( connection->error )
-    {
-      mpd_closeConnection(connection);
-      return -1;
-    }
-  
-  c->connection = connection;
-
-  if( password )
-    {
-      mpd_sendPasswordCommand(connection, password);
-      mpd_finishCommand(connection);
-    }
-
-  return 0;
-}
-
-
-int
-mpc_error(mpd_client_t *c)
-{
-  if( c == NULL || c->connection == NULL )
-    return 1;
-  if( c->connection->error )
-    return c->connection->error;
-
-  return 0;
-}
-
-char *
-mpc_error_str(mpd_client_t *c)
-{
-  if( c == NULL || c->connection == NULL )
-    return "Not connected";
-
-  if( c->connection && c->connection->errorStr )
-    return c->connection->errorStr;
-
-  return NULL;
-}
-
-
-
-int
-mpc_free_playlist(mpd_client_t *c)
-{
-  GList *list;
-
-  if( c==NULL || c->playlist==NULL )
-    return -1;
-
-  list=g_list_first(c->playlist);
-
-  while( list!=NULL )
-    {
-      mpd_Song *song = (mpd_Song *) list->data;
-
-      mpd_freeSong(song);
-      list=list->next;
-    }
-  g_list_free(c->playlist);
-  c->playlist=NULL;
-  c->playlist_length=0;
-
-  c->song_id = -1;
-  c->song = NULL;
-
-  return 0;
-}
-
-int 
-mpc_update_playlist(mpd_client_t *c)
-{
-  mpd_InfoEntity *entity;
-
-  D(fprintf(stderr, "mpc_update_playlist() [%d]\n",  c->status->playlist));
-
-  if( mpc_error(c) )
-    return -1;
-
-  if( c->playlist )
-    mpc_free_playlist(c);
-
-  c->playlist_length=0;
-  mpd_sendPlaylistInfoCommand(c->connection,-1);
-  if( mpc_error(c) )
-    return -1;
-  while( (entity=mpd_getNextInfoEntity(c->connection)) ) 
-    {
-      if(entity->type==MPD_INFO_ENTITY_TYPE_SONG) 
-	{
-	  mpd_Song *song = mpd_songDup(entity->info.song);
-
-	  c->playlist = g_list_append(c->playlist, (gpointer) song);
-	  c->playlist_length++;
-	}
-      mpd_freeInfoEntity(entity);
-    }
-  c->playlist_id = c->status->playlist;
-  c->playlist_updated = 1;
-  c->song_id = -1;
-  c->song = NULL;
-
-  mpc_filelist_set_selected(c);
-
-  return 0;
-}
-
-int
-mpc_playlist_get_song_index(mpd_client_t *c, char *filename)
-{
-  GList *list = c->playlist;
-  int i=0;
-
-  while( list )
-    {
-      mpd_Song *song = (mpd_Song *) list->data;
-      if( strcmp(song->file, filename ) == 0 )	
-	return i;
-      list=list->next;
-      i++;
-    }
-  return -1;
-}
-
-mpd_Song *
-mpc_playlist_get_song(mpd_client_t *c, int n)
-{
-  return (mpd_Song *) g_list_nth_data(c->playlist, n);
-}
-
-
-char *
-mpc_get_song_name(mpd_Song *song)
-{
-  static char buf[MAX_SONG_LENGTH];
-  char *name;
-  
-  if( song->title )
-    {
-      if( song->artist )
-	{
-	  snprintf(buf, MAX_SONG_LENGTH, "%s - %s", song->artist, song->title);
-	  name = utf8_to_locale(buf);
-	  strncpy(buf, name, MAX_SONG_LENGTH);
-	  g_free(name);
-	  return buf;
-	}
-      else
-	{
-	  name = utf8_to_locale(song->title);
-	  strncpy(buf, name, MAX_SONG_LENGTH);
-	  g_free(name);
-	  return buf;
-	}
-    }
-  name = utf8_to_locale(basename(song->file));
-  strncpy(buf, name, MAX_SONG_LENGTH);
-  g_free(name);
-  return buf;
-}
-
-int 
-mpc_update(mpd_client_t *c)
-{
-  if( mpc_error(c) )
-    return -1;
-
-  if( c->status )
-    {
-      mpd_freeStatus(c->status);
-    }
-
-  c->status = mpd_getStatus(c->connection);
-  if( mpc_error(c) )
-    return -1;
-  
-  if( c->playlist_id!=c->status->playlist )
-    mpc_update_playlist(c);
-  
-  if( !c->song || c->status->song != c->song_id )
-    {
-      c->song = mpc_playlist_get_song(c, c->status->song);
-      c->song_id = c->status->song;
-      c->song_updated = 1;
-    }
-
-  return 0;
-}
-
-
-
-
-
-
-int
-mpc_free_filelist(mpd_client_t *c)
-{
-  GList *list;
-
-  if( c==NULL || c->filelist==NULL )
-    return -1;
-
-  list=g_list_first(c->filelist);
-
-  while( list!=NULL )
-    {
-      filelist_entry_t *entry = list->data;
-
-      if( entry->entity )
-	mpd_freeInfoEntity(entry->entity);
-      g_free(entry);
-      list=list->next;
-    }
-  g_list_free(c->filelist);
-  c->filelist=NULL;
-  c->filelist_length=0;
-
-  return 0;
-}
-
-
-
-int 
-mpc_update_filelist(mpd_client_t *c)
-{
-  mpd_InfoEntity *entity;
-
-  if( mpc_error(c) )
-    return -1;
-
-  if( c->filelist )
-    mpc_free_filelist(c);
-
-  c->filelist_length=0;
-
-  //  mpd_sendListallCommand(conn,"");
-  mpd_sendLsInfoCommand(c->connection, c->cwd);
-
-  if( c->cwd && c->cwd[0] )
-    {
-      /* add a dummy entry for ./.. */
-      filelist_entry_t *entry = g_malloc(sizeof(filelist_entry_t));
-      memset(entry, 0, sizeof(filelist_entry_t));
-      entry->entity = NULL;
-      c->filelist = g_list_append(c->filelist, (gpointer) entry);
-      c->filelist_length++;
-    }
-
-  while( (entity=mpd_getNextInfoEntity(c->connection)) ) 
-    {
-      filelist_entry_t *entry = g_malloc(sizeof(filelist_entry_t));
-      
-      memset(entry, 0, sizeof(filelist_entry_t));
-      entry->entity = entity;
-      c->filelist = g_list_append(c->filelist, (gpointer) entry);
-      c->filelist_length++;
-    }
-  
-  c->filelist_updated = 1;
-
-  mpd_finishCommand(c->connection);
-
-  mpc_filelist_set_selected(c);
-
-  return 0;
-}
-
-int 
-mpc_filelist_set_selected(mpd_client_t *c)
-{
-  GList *list = c->filelist;
-
-  while( list )
-    {
-      filelist_entry_t *entry = list->data;
-      mpd_InfoEntity *entity = entry->entity ;      
-      
-      if( entity && entity->type==MPD_INFO_ENTITY_TYPE_SONG )
-	{
-	  mpd_Song *song = entity->info.song;
-
-	  if( mpc_playlist_get_song_index(c, song->file) >= 0 )
-	    entry->selected = 1;
-	  else
-	    entry->selected = 0;
-	}
-
-      list=list->next;
-    }
-  return 0;
-}