commit b1936dd635746d04beb5d4e1d428c610a25d8f0e
Author: phantomjinx <[email protected]>
Date: Sat Jan 1 22:08:15 2011 +0000
Remove ogg and flac preferences
* Pointless conversion preferences since the only reason to add files of one
of these formats is to add them to an ipod so need to be converted
* prefs.c
* preferences no longer need to be set
* core_prefs.*
* preference checkboxes removed since ability to convert them depends on
addition of appropriate file type plugin and they must be converted to
be useful
libgtkpod/prefs.c | 2 -
plugins/core_preferences/core_prefs.c | 2 -
plugins/core_preferences/core_prefs.xml | 76 ++-----------------------------
plugins/filetype_flac/flacfile.c | 2 +-
plugins/filetype_ogg/oggfile.c | 2 +-
5 files changed, 7 insertions(+), 77 deletions(-)
---
diff --git a/libgtkpod/prefs.c b/libgtkpod/prefs.c
index bfd769d..6b48b21 100644
--- a/libgtkpod/prefs.c
+++ b/libgtkpod/prefs.c
@@ -176,12 +176,10 @@ static void set_default_preferences() {
str = g_build_filename(get_script_dir(), "convert-2mp3.sh", NULL);
prefs_set_string("path_conv_ogg", str);
g_free(str);
- prefs_set_int("convert_ogg", TRUE);
str = g_build_filename(get_script_dir(), "convert-2mp3.sh", NULL);
prefs_set_string("path_conv_flac", str);
g_free(str);
- prefs_set_int("convert_flac", TRUE);
str = g_build_filename(get_script_dir(), "convert-2mp3.sh", NULL);
prefs_set_string("path_conv_wav", str);
diff --git a/plugins/core_preferences/core_prefs.c
b/plugins/core_preferences/core_prefs.c
index b12febd..cf8e2b8 100644
--- a/plugins/core_preferences/core_prefs.c
+++ b/plugins/core_preferences/core_prefs.c
@@ -90,8 +90,6 @@ const gchar *checkbox_map[][3] =
const gchar *conv_checkbox_map[][3] =
{
- { "convert_ogg", "convert_ogg", NULL },
- { "convert_flac", "convert_flac", NULL },
{ "convert_mp3", "convert_mp3", NULL },
{ "convert_aac", "convert_m4a", NULL },
{ "convert_wav", "convert_wav", NULL },
diff --git a/plugins/core_preferences/core_prefs.xml
b/plugins/core_preferences/core_prefs.xml
index 99bd458..829ff2e 100644
--- a/plugins/core_preferences/core_prefs.xml
+++ b/plugins/core_preferences/core_prefs.xml
@@ -251,7 +251,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="text"></property>
<signal name="changed" handler="on_filename_pattern_changed"/>
</object>
<packing>
@@ -1010,73 +1009,6 @@ Examples:
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
- <object class="GtkFrame" id="frame21">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment39">
- <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="vbox34">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="convert_ogg">
- <property name="label" translatable="yes">Convert
Ogg Vorbis</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled"
handler="on_simple_checkbox_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="convert_flac">
- <property name="label" translatable="yes">Convert
FLAC</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled"
handler="on_simple_checkbox_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label42">
- <property name="visible">True</property>
- <property name="label"
translatable="yes"><b>Incompatible Formats</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkFrame" id="frame22">
<property name="visible">True</property>
<property name="label_xalign">0</property>
@@ -1096,6 +1028,7 @@ Examples:
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Convert
compatible formats to a single format</property>
+ <property name="use_markup">True</property>
</object>
<packing>
<property name="position">0</property>
@@ -1182,7 +1115,7 @@ Examples:
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1386,7 +1319,7 @@ Examples:
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -1982,7 +1915,7 @@ Examples:
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label"
translatable="yes">Convert incompatible music formats to:</property>
+ <property name="label"
translatable="yes">Convert incompatible audio formats to:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2063,6 +1996,7 @@ Examples:
</child>
</object>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/plugins/filetype_flac/flacfile.c b/plugins/filetype_flac/flacfile.c
index 33cafb2..617b0c9 100644
--- a/plugins/filetype_flac/flacfile.c
+++ b/plugins/filetype_flac/flacfile.c
@@ -167,7 +167,7 @@ Track *flac_get_file_info(const gchar *flacFileName) {
gboolean flac_can_convert() {
gchar *cmd = flac_get_conversion_cmd();
- return cmd && cmd[0] && prefs_get_int("convert_flac");
+ return cmd && cmd[0];
}
gchar *flac_get_conversion_cmd() {
diff --git a/plugins/filetype_ogg/oggfile.c b/plugins/filetype_ogg/oggfile.c
index 19ced24..42c8e78 100644
--- a/plugins/filetype_ogg/oggfile.c
+++ b/plugins/filetype_ogg/oggfile.c
@@ -147,7 +147,7 @@ Track *ogg_get_file_info(const gchar *oggFileName) {
gboolean ogg_can_convert() {
gchar *cmd = ogg_get_conversion_cmd();
- return cmd && cmd[0] && prefs_get_int("convert_ogg");
+ return cmd && cmd[0];
}
gchar *ogg_get_conversion_cmd() {
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
