From 23cea0103d4063d52a145d4872320ab7070e8ce2 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <PromyLOPh@lavabit.com>
Date: Sat, 9 May 2009 18:08:09 +0200
Subject: Finally remove id3 rewriting...

---
 src/callback.h |  2 --
 src/cfg.c      | 21 ---------------------
 src/cfg.h      |  3 ---
 3 files changed, 26 deletions(-)

diff --git a/src/callback.h b/src/callback.h
index fcdf7c0..d506c4a 100644
--- a/src/callback.h
+++ b/src/callback.h
@@ -56,8 +56,6 @@ void mpiosh_cmd_restore(char *args[]);
 void mpiosh_cmd_config(char *args[]);
 #endif
 void mpiosh_cmd_channel(char *args[]);
-void mpiosh_cmd_id3(char *args[]);
-void mpiosh_cmd_id3_format(char *args[]);
 void mpiosh_cmd_font_upload(char *args[]);
 
 /* local command callbacks */
diff --git a/src/cfg.c b/src/cfg.c
index 9d6048b..b8c1acd 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -143,22 +143,6 @@ mpiosh_config_read(struct mpiosh_config_t *config)
       config->charset = NULL;
     }
 
-    value = mpiosh_config_read_key(config, "mpiosh", "id3_rewriting");
-    if (value) {
-      if (!strcmp("on", value)) {
-	config->id3_rewriting = 1;
-      } else  {
-	config->id3_rewriting = 0;
-      }
-    }
-
-    value = mpiosh_config_read_key(config, "mpiosh", "id3_format");
-    if (value) {
-      config->id3_format = strdup(value);
-    } else {
-      config->id3_format = strdup(MPIO_ID3_FORMAT);
-    }
-    
   }
 
   return 1;
@@ -209,11 +193,6 @@ mpiosh_config_write( struct mpiosh_config_t *config )
     else
       cfg_key_set_value(config->handle_user,
 			"mpiosh", "default_mem", "internal");
-    cfg_key_set_value(config->handle_user,
-		      "mpiosh", "id3_rewriting", 
-		      (config->id3_rewriting?"on":"off"));
-    cfg_key_set_value(config->handle_user,
-		      "mpiosh", "id3_format", config->id3_format);
 
     cfg_save(config->handle_user, 0);
 
diff --git a/src/cfg.h b/src/cfg.h
index ab3ecd3..c190233 100644
--- a/src/cfg.h
+++ b/src/cfg.h
@@ -32,9 +32,6 @@ struct mpiosh_config_t {
   char 		*prompt_ext;
   char          *charset;
   unsigned	default_mem;
-
-  unsigned      id3_rewriting;
-  char          *id3_format;
 };
 
 struct mpiosh_config_t *mpiosh_config_new(void);
-- 
cgit v1.2.3