Revision: 2208
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2208&view=rev
Author: jcsjcs
Date: 2009-01-13 13:17:43 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
* src/file_export.c: add export template for mp4 files.
src/prefs.c: remove references to export_template which
wasn't used. Thanks to Todd to point out both.
Modified Paths:
--------------
gtkpod/trunk/ChangeLog
gtkpod/trunk/src/file_export.c
gtkpod/trunk/src/prefs.c
Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog 2009-01-11 13:46:54 UTC (rev 2207)
+++ gtkpod/trunk/ChangeLog 2009-01-13 13:17:43 UTC (rev 2208)
@@ -1,3 +1,10 @@
+2008-01-13 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/file_export.c: add export template for mp4 files.
+
+ src/prefs.c: remove references to export_template which
+ wasn't used. Thanks to Todd to point out both.
+
2008-01-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
* data/gtkpod.glade: add property "translatble=yes" to the check
Modified: gtkpod/trunk/src/file_export.c
===================================================================
--- gtkpod/trunk/src/file_export.c 2009-01-11 13:46:54 UTC (rev 2207)
+++ gtkpod/trunk/src/file_export.c 2009-01-13 13:17:43 UTC (rev 2208)
@@ -1,5 +1,4 @@
-/* Time-stamp: <2007-02-24 13:22:58 jcs>
-|
+/*
| Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -73,9 +72,8 @@
const gchar *EXPORT_FILES_PATH="export_files_path";
const gchar *EXPORT_FILES_TPL="export_files_template";
/* Default prefs settings */
-const gchar *EXPORT_FILES_TPL_DFLT="%o;%a - %t.mp3;%t.wav";
+const gchar *EXPORT_FILES_TPL_DFLT="%o;%a - %t.m4a;%a - %t.mp3;%t.wav";
-
/**
* READ_WRITE_BLOCKSIZE - how many bytes we read per fread/fwrite call
*/
Modified: gtkpod/trunk/src/prefs.c
===================================================================
--- gtkpod/trunk/src/prefs.c 2009-01-11 13:46:54 UTC (rev 2207)
+++ gtkpod/trunk/src/prefs.c 2009-01-13 13:17:43 UTC (rev 2208)
@@ -301,7 +301,6 @@
prefs_set_int("display_toolbar", TRUE);
prefs_set_int("toolbar_style", GTK_TOOLBAR_BOTH);
prefs_set_int("sha1", TRUE);
- prefs_set_string("export_template", "%o;%a - %t.mp3;%t.wav");
prefs_set_int("file_dialog_details_expanded", FALSE);
/* Set last browsed directory */
@@ -847,7 +846,6 @@
static void cleanup_keys()
{
gchar *buf;
- gchar *sp = NULL;
gint int_buf;
gint i;
gint x, y, p; /* Window position */
@@ -1050,6 +1048,8 @@
prefs_set_string("autoimport", NULL);
prefs_set_string("auto_import", NULL);
prefs_set_string("conversion_enable", NULL);
+ prefs_set_string("export_template", NULL);
+ prefs_set_string("filename_format", NULL);
/* sp_created_cond renamed to sp_added_cond */
for (i = 0; i < SORT_TAB_MAX; i++)
@@ -1156,50 +1156,6 @@
prefs_set_string("sm_sort_", NULL);
}
- /* filename_format renamed to export_template */
- if (prefs_get_string_value("filename_format", &buf))
- {
- prefs_set_string("export_template", buf);
- g_free(buf);
- prefs_set_string("filename_format", NULL);
- }
-
- /* This string was a wrong autoconvert--just ignore it */
- buf = prefs_get_string("export_template");
-
- if (buf && strcmp(buf, "%a - %a/%T - %T.mp3") == 0)
- prefs_set_string("export_template", NULL);
-
- g_free (buf);
-
- /* We changed the meaning of the %x in export_template */
- if (version < 0.72)
- {
- /* changed the meaning of the %x in export_template */
- if (sp) while (*sp)
- {
- if (sp[0] == '%')
- {
- switch (sp[1]) {
- case 'A':
- sp[1] = 'a';
- break;
- case 'd':
- sp[1] = 'A';
- break;
- case 'n':
- sp[1] = 't';
- break;
- case 't':
- sp[1] = 'T';
- break;
- default:
- break;
- }
- }
- }
- }
-
/* For versions < 0.91, remove all itdb keys */
if (version < 0.91)
prefs_flush_subkey("itdb_");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
