Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7324
Modified Files:
ChangeLog_detailed gtkpod.glade
Log Message:
* src/prefs.h: removed unused declarations.
* src/file.c: fixed two memory leaks.
* src/misc_playlist.c: fixed memory leak.
* src/file.c:
Got rid of get_file_name_verified(),
get_file_name_on_ipod)( as they can be emulated by
get_file_name_from_source().
Got rid of get_file_name() and get_file_name_on_harddisk
(substituted where used) used).
* src/mp3file.c: removed mp3gain code
* src/tools.c: added mp3gain and aacgain code.
* src/prefs_windows.c: added aacgain path in the Tools
section, improved layout.
Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- ChangeLog_detailed 11 Jun 2006 05:18:55 -0000 1.243
+++ ChangeLog_detailed 11 Jun 2006 16:04:40 -0000 1.244
@@ -2,6 +2,25 @@
* src/prefs.h: removed unused declarations.
+ * src/file.c: fixed two memory leaks.
+
+ * src/misc_playlist.c: fixed memory leak.
+
+ * src/file.c:
+ Got rid of get_file_name_verified(),
+ get_file_name_on_ipod)( as they can be emulated by
+ get_file_name_from_source().
+
+ Got rid of get_file_name() and get_file_name_on_harddisk
+ (substituted where used) used).
+
+ * src/mp3file.c: removed mp3gain code
+
+ * src/tools.c: added mp3gain and aacgain code.
+
+ * src/prefs_windows.c: added aacgain path in the Tools
+ section, improved layout.
+
2006-06-10 Jorg Schuler <[EMAIL PROTECTED]>
* src/mp4file.c: read aacgain if present.
Index: gtkpod.glade
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- gtkpod.glade 10 Jun 2006 13:39:47 -0000 1.208
+++ gtkpod.glade 11 Jun 2006 16:04:41 -0000 1.209
@@ -12673,156 +12673,149 @@
</child>
<child>
- <widget class="GtkVBox" id="vbox88">
+ <widget class="GtkTable" id="table50">
<property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="row_spacing">8</property>
+ <property name="column_spacing">8</property>
<child>
- <widget class="GtkHBox" id="hbox86">
+ <widget class="GtkLabel" id="label214">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">8</property>
-
- <child>
- <widget class="GtkLabel" id="label214">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Command for 'Play now':</property>
- <property
name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property
name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property
name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry"
id="play_now_path_entry">
- <property name="visible">True</property>
- <property name="tooltip"
translatable="yes">For example, 'xmms %s' will clear xmms' current playlist,
add the selected tracks and start playing.</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text"
translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property
name="activates_default">False</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">Command
for 'Play now':</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkButton"
id="play_now_path_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label"
translatable="yes">Browse</property>
- <property name="use_underline">True</property>
- <property
name="relief">GTK_RELIEF_NORMAL</property>
- <property
name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkLabel" id="label215">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Command
for 'Enqueue':</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox87">
+ <widget class="GtkEntry" id="play_now_path_entry">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">8</property>
+ <property name="tooltip" translatable="yes">For
example, 'xmms %s' will clear xmms' current playlist, add the selected tracks
and start playing.</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text"
translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property
name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkLabel" id="label215">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Command for 'Enqueue':</property>
- <property
name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property
name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property
name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkEntry"
id="play_enqueue_path_entry">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">For
example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms'
current playlist.</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text"
translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property
name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkEntry"
id="play_enqueue_path_entry">
- <property name="visible">True</property>
- <property name="tooltip"
translatable="yes">For example, 'xmms -e %s' will append (enqueue) the selected
tracks to xmms' current playlist.</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text"
translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property
name="activates_default">False</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkButton" id="play_now_path_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes">Browse</property>
+ <property name="use_underline">True</property>
+ <property
name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkButton"
id="play_enqueue_path_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label"
translatable="yes">Browse</property>
- <property name="use_underline">True</property>
- <property
name="relief">GTK_RELIEF_NORMAL</property>
- <property
name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkButton"
id="play_enqueue_path_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes">Browse</property>
+ <property name="use_underline">True</property>
+ <property
name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -12882,7 +12875,7 @@
<widget class="GtkHBox" id="hbox88">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">8</property>
<child>
<widget class="GtkLabel" id="label218">
@@ -12910,10 +12903,13 @@
</child>
<child>
- <widget class="GtkHBox" id="hbox89">
+ <widget class="GtkTable" id="table49">
<property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
<property name="homogeneous">False</property>
- <property name="spacing">8</property>
+ <property name="row_spacing">8</property>
+ <property name="column_spacing">8</property>
<child>
<widget class="GtkLabel" id="label219">
@@ -12924,7 +12920,7 @@
<property
name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
@@ -12934,16 +12930,19 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="mp3gain_path_entry">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">You
only need to specify this if your 'mp3gain' executable is not in your default
path. Example: '/usr/local/foo/mp3gain'. mp3gain will write the calculated gain
value back to the file -- if you don't want this, set this entry to /bin/true
or similar. mp3gain is only called if appropriate tags are not already set by
your encoder. E.g. lame version 0.95 already writes the gain values into tags.
The exact conversion factor between mp3gain's gain value and iPod's volume tag
is not known yet -- your input is appreciated.</property>
+ <property name="tooltip" translatable="yes">Set
this to 'mp3gain -q -k' to use the 'Normalize volume' functionality in the
Tools Menu. If this is set, missing normalization data for mp3 files will be
calculated and written to your mp3 file using this command.</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
@@ -12954,9 +12953,11 @@
<property
name="activates_default">False</property>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="y_options"></property>
</packing>
</child>
@@ -12970,9 +12971,81 @@
<property name="focus_on_click">True</property>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label432">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">'aacgain' executable:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="aacgain_path_entry">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Set
this to 'aacgain -q -k' to use the 'Normalize volume' functionality in the
Tools Menu. If this is set, missing normalization data for .m4a and .m4b files
will be calculated and written to your music file using this command.</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text"
translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property
name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="aacgain_path_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes">Browse</property>
+ <property name="use_underline">True</property>
+ <property
name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
