From: Marko Nykanen <marko.nykanen@gmail.com>
Date: Mon, 30 Nov 2009 19:47:03 +0000 (+0200)
Subject: bigger icons, tmpdir
X-Git-Tag: 0.3.2
X-Git-Url: http://git.maemo.org/git/?p=maemo-recorder;a=commitdiff_plain;h=834d84eb136946be66dc33105f57ccfd5fe14c68;hp=5dd087636e42968e6b88a4b6a34401c1ed91af33;ds=inline

bigger icons, tmpdir
---

diff --git a/data/pause.png b/data/pause.png
index 895a908..6a165b4 100644
Binary files a/data/pause.png and b/data/pause.png differ
diff --git a/data/play.png b/data/play.png
index beb197c..e65ae29 100644
Binary files a/data/play.png and b/data/play.png differ
diff --git a/data/record.png b/data/record.png
index bf00e5f..ae6c70e 100644
Binary files a/data/record.png and b/data/record.png differ
diff --git a/data/stop.png b/data/stop.png
index e90cba8..d33764f 100644
Binary files a/data/stop.png and b/data/stop.png differ
diff --git a/debian/recorder.postinst b/debian/recorder.postinst
index bc9840b..74f2f1b 100644
--- a/debian/recorder.postinst
+++ b/debian/recorder.postinst
@@ -22,7 +22,6 @@ case "$1" in
 	update-mime-database /usr/share/mime
 	update-desktop-database -q
 	hildon-update-category-database /usr/share/mime
-    gconftool -s /apps/maemo-recorder/settings/default_dir "/home/user/MyDocs/.recorder" --type=string
 	;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/src/maemo-recorder-ui.c b/src/maemo-recorder-ui.c
index b0e4b75..6d95261 100644
--- a/src/maemo-recorder-ui.c
+++ b/src/maemo-recorder-ui.c
@@ -1185,33 +1185,33 @@ static void cbRec(GtkWidget* widget, GdkEventButton *event, AppData *data)
     switch (data->filter)
     {
         case FORMAT_PCM:
-             data->saveFileName = g_strdup_printf("%s/%s", get_default_dir(), DEFAULT_TMP_FILE);
-             data->openFileName = g_strdup_printf("%s/%s", get_default_dir(), DEFAULT_TMP_FILE);
+             data->saveFileName = g_strdup_printf("%s/%s", DEFAULT_TMP_DIR, DEFAULT_TMP_FILE);
+             data->openFileName = g_strdup_printf("%s/%s", DEFAULT_TMP_DIR, DEFAULT_TMP_FILE);
              break;
 
          case FORMAT_PCMA:
-             data->saveFileName = g_strdup_printf("%s/%s", get_default_dir(), DEFAULT_TMP_PCMA_FILE);
-             data->openFileName = g_strdup_printf("%s/%s", get_default_dir(), DEFAULT_TMP_PCMA_FILE);
+             data->saveFileName = g_strdup_printf("%s/%s", DEFAULT_TMP_DIR, DEFAULT_TMP_PCMA_FILE);
+             data->openFileName = g_strdup_printf("%s/%s", DEFAULT_TMP_DIR, DEFAULT_TMP_PCMA_FILE);
              break;
              
          case FORMAT_PCMU:
-             data->saveFileName = g_strdup_printf("%s/%s", get_default_dir(), DEFAULT_TMP_PCMU_FILE);
-             data->openFileName = g_strdup_printf("%s/%s", get_default_dir(), DEFAULT_TMP_PCMU_FILE);
+             data->saveFileName = g_strdup_printf("%s/%s", DEFAULT_TMP_DIR, DEFAULT_TMP_PCMU_FILE);
+             data->openFileName = g_strdup_printf("%s/%s", DEFAULT_TMP_DIR, DEFAULT_TMP_PCMU_FILE);
              break;
 
          case FORMAT_WAV:
-             data->saveFileName = g_strdup_printf("%s/%s", get_default_dir(), DEFAULT_TMP_WAV_FILE);
-             data->openFileName = g_strdup_printf("%s/%s", get_default_dir(), DEFAULT_TMP_WAV_FILE);
+             data->saveFileName = g_strdup_printf("%s/%s", DEFAULT_TMP_DIR, DEFAULT_TMP_WAV_FILE);
+             data->openFileName = g_strdup_printf("%s/%s", DEFAULT_TMP_DIR, DEFAULT_TMP_WAV_FILE);
              break;
 
          case FORMAT_ILBC:
          default:
-             data->saveFileName = g_strdup_printf("%s/%s", get_default_dir(), DEFAULT_TMP_ILBC_FILE);
-             data->openFileName = g_strdup_printf("%s/%s", get_default_dir(), DEFAULT_TMP_ILBC_FILE);
+             data->saveFileName = g_strdup_printf("%s/%s", DEFAULT_TMP_DIR, DEFAULT_TMP_ILBC_FILE);
+             data->openFileName = g_strdup_printf("%s/%s", DEFAULT_TMP_DIR, DEFAULT_TMP_ILBC_FILE);
             break;
     }
 
-    g_mkdir(get_default_dir(), 755);
+    g_mkdir(DEFAULT_TMP_DIR, 755);
     
     ULOG_INFO("%s() - creating pipelines", G_STRFUNC);
     /* start recording */
diff --git a/src/maemo-recorder.h b/src/maemo-recorder.h
index 4a3f66d..35e6196 100644
--- a/src/maemo-recorder.h
+++ b/src/maemo-recorder.h
@@ -94,6 +94,8 @@ typedef enum
 #define REC_ICON "/usr/share/pixmaps/recorder/record.png"
 #define STOP_ICON "/usr/share/pixmaps/recorder/stop.png"
 
+#define DEFAULT_TMP_DIR "/home/user/MyDocs/.recorder"
+
 /* TODO: this kind of struct might be more handy when passing around audioformat info */
 #if 0
 struct _AudioFormatSpec
diff --git a/src/settings.c b/src/settings.c
index 2147f2b..2487ffe 100755
--- a/src/settings.c
+++ b/src/settings.c
@@ -38,6 +38,8 @@
 #define KEY_DEFAULT_DIR     GCONF_PATH "/default_dir"
 #define KEY_DEFAULT_FILTER  GCONF_PATH "/default_filter"
 
+#define DEFAULT_SAVE_DIR "/home/user/MyDocs/.sounds"
+
 typedef struct _SettingsPriv SettingsPriv;
 
 struct _SettingsPriv
@@ -68,7 +70,7 @@ reset_defaults()
 {
     gchar *str;
 
-    str = g_strdup_printf("/home/user/MyDocs/.recorder");
+    str = g_strdup_printf(DEFAULT_SAVE_DIR);
     gconf_client_set_string(settings_priv->gconf, KEY_DEFAULT_DIR, str, NULL);
     g_free(settings_priv->default_dir);
     settings_priv->default_dir = str;