Revision: 2145
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2145&view=rev
Author: jcsjcs
Date: 2008-10-29 15:44:14 +0000 (Wed, 29 Oct 2008)
Log Message:
-----------
* src/prefs.c
src/prefsdlg.c
src/file_convert.c
data/gtkpod.glade: straighten out bug that allowed to unselect
conversion and as a side effect switched off copying of the
music files to the iPod.
Modified Paths:
--------------
gtkpod/trunk/ChangeLog
gtkpod/trunk/data/gtkpod.glade
gtkpod/trunk/src/file_convert.c
gtkpod/trunk/src/prefs.c
gtkpod/trunk/src/prefsdlg.c
Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog 2008-10-22 13:57:00 UTC (rev 2144)
+++ gtkpod/trunk/ChangeLog 2008-10-29 15:44:14 UTC (rev 2145)
@@ -1,3 +1,12 @@
+2008-10-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/prefs.c
+ src/prefsdlg.c
+ src/file_convert.c
+ data/gtkpod.glade: straighten out bug that allowed to unselect
+ conversion and as a side effect switched off copying of the
+ music files to the iPod.
+
2008-10-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
* src/prefsdlg.c
Modified: gtkpod/trunk/data/gtkpod.glade
===================================================================
--- gtkpod/trunk/data/gtkpod.glade 2008-10-22 13:57:00 UTC (rev 2144)
+++ gtkpod/trunk/data/gtkpod.glade 2008-10-29 15:44:14 UTC (rev 2145)
@@ -10561,25 +10561,18 @@
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkCheckButton"
id="enable_conversion">
+ <widget class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label"
translatable="yes">Convert incompatible music formats to: </property>
- <property
name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="active">True</property>
- <property
name="draw_indicator">True</property>
- <signal name="toggled"
handler="on_simple_checkbox_toggled"/>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Convert incompatible music formats to:</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkComboBox"
id="target_format">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="items"
translatable="yes">MP3
AAC
</property>
@@ -10638,8 +10631,6 @@
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -13085,20 +13076,11 @@
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton"
id="convert_compatible">
+ <widget class="GtkLabel" id="label45">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Convert
compatible formats to a single format</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled"
handler="on_unsetdeps_checkbox_toggled"/>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
</child>
<child>
<widget class="GtkAlignment" id="alignment42">
Modified: gtkpod/trunk/src/file_convert.c
===================================================================
--- gtkpod/trunk/src/file_convert.c 2008-10-22 13:57:00 UTC (rev 2144)
+++ gtkpod/trunk/src/file_convert.c 2008-10-29 15:44:14 UTC (rev 2145)
@@ -1049,15 +1049,21 @@
gboolean convert = FALSE, must_convert = FALSE;
gboolean result = TRUE;
+ debug ("entering conversion_add_track\n");
+
g_return_val_if_fail (conv, FALSE);
g_return_val_if_fail (track, FALSE);
g_return_val_if_fail (track->itdb, FALSE);
etr = track->userdata;
g_return_val_if_fail (etr, FALSE);
- if ((track->itdb->usertype & GP_ITDB_TYPE_LOCAL) || (track->transferred) ||
- !prefs_get_int ("conversion_enable"))
- {
+ debug ("considering '%s' to conversion/transfer list\n",
etr->pc_path_locale);
+
+ if ((track->itdb->usertype & GP_ITDB_TYPE_LOCAL) || (track->transferred))
+ {
+ debug ("adding aborted: lcl:%d, trsfrd:%d\n",
+ track->itdb->usertype & GP_ITDB_TYPE_LOCAL,
+ track->transferred);
/* no conversion or transfer needed */
return TRUE;
}
Modified: gtkpod/trunk/src/prefs.c
===================================================================
--- gtkpod/trunk/src/prefs.c 2008-10-22 13:57:00 UTC (rev 2144)
+++ gtkpod/trunk/src/prefs.c 2008-10-29 15:44:14 UTC (rev 2145)
@@ -324,7 +324,6 @@
prefs_set_int("tm_sort", SORT_NONE);
/* New conversion preferences */
- prefs_set_int("conversion_enable", TRUE);
prefs_set_int("conversion_target_format", TARGET_FORMAT_MP3);
}
@@ -1052,6 +1051,7 @@
prefs_set_string("size_file_dialog_details.y", NULL);
prefs_set_string("autoimport", NULL);
prefs_set_string("auto_import", NULL);
+ prefs_set_string("conversion_enable", NULL);
/* sp_created_cond renamed to sp_added_cond */
for (i = 0; i < SORT_TAB_MAX; i++)
Modified: gtkpod/trunk/src/prefsdlg.c
===================================================================
--- gtkpod/trunk/src/prefsdlg.c 2008-10-22 13:57:00 UTC (rev 2144)
+++ gtkpod/trunk/src/prefsdlg.c 2008-10-29 15:44:14 UTC (rev 2145)
@@ -79,7 +79,6 @@
{ "delete_missing", "sync_delete_tracks", NULL },
{ "update_existing_track", "update_existing", NULL },
{ "include_neverplayed", "not_played_track", NULL },
- { "enable_conversion", "conversion_enable",
"target_format,conversion_settings" },
/* Metadata tab */
{ "read_tags", "readtags", NULL },
{ "parse_filename_tags", "parsetags", "customize_tags" },
@@ -107,7 +106,6 @@
const gchar *conv_checkbox_map[][3] = {
{ "convert_ogg", "convert_ogg", NULL },
{ "convert_flac", "convert_flac", NULL },
- { "convert_compatible", NULL, "convert_mp3,convert_aac,convert_wav" },
{ "convert_mp3", "convert_mp3", NULL },
{ "convert_aac", "convert_m4a", NULL },
{ "convert_wav", "convert_wav", NULL },
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 the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
