Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18704

Modified Files:
        ChangeLog ChangeLog_detailed gtkpod.glade 
Log Message:
        * mp4file.c: update instructions at the beginnging of the
          file, read soundcheck values irrespective of "readtags"
          setting.

        * gtkpod.glade
          src/prefs.c
          src/prefs_windows.c
          src/mp3file.c
          src/file.c: implement "coverart_apic" prefs key allowing to
          select whether coverart stored in tags should be used or not.

        * src/display_itdb.c
          src/display_itdb.h: new: gp_track_set_thumbnails_from_data()



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- ChangeLog   10 Jun 2006 16:14:14 -0000      1.186
+++ ChangeLog   18 Sep 2006 07:10:44 -0000      1.187
@@ -7,9 +7,12 @@
        and after saving (gtkpod.eject) with the mountpoint as the
        first argument.
 
-       IMPROVEMENT: Displays artwork on some newer iPod models now as
+       IMPROVEMENT: Displays coverart on some newer iPod models now as
        well -- this includes the new mobile phone iPods.
 
+       IMPROVEMENT: Coverart can be read from the APIC tag if present.
+       Up to now coverart had to be provided in spearate files.
+
        IMPROVEMENT: Podcasts are marked as unplayed (on the iPod, with
        a bullet in front of the title) when newly added to the podcast
        list, and unmarked once they have been played once on the iPod.

Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- ChangeLog_detailed  17 Sep 2006 17:18:13 -0000      1.321
+++ ChangeLog_detailed  18 Sep 2006 07:10:44 -0000      1.322
@@ -3,6 +3,20 @@
        * mp3file.c: support reading of coverart from APIC
           tag. Work around non-conformant tags written by iTunes.
 
+       * mp4file.c: update instructions at the beginnging of the
+          file, read soundcheck values irrespective of "readtags"
+          setting.
+
+       * gtkpod.glade
+         src/prefs.c
+         src/prefs_windows.c
+         src/mp3file.c
+         src/file.c: implement "coverart_apic" prefs key allowing to
+         select whether coverart stored in tags should be used or not.
+
+       * src/display_itdb.c
+         src/display_itdb.h: new: gp_track_set_thumbnails_from_data()
+
 2006-09-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
        * misc_conversion.c: Typo: "Suffling" -> "Shuffling". Thanks

Index: gtkpod.glade
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- gtkpod.glade        1 Sep 2006 13:18:42 -0000       1.213
+++ gtkpod.glade        18 Sep 2006 07:10:44 -0000      1.214
@@ -9344,7 +9344,7 @@
                  <child>
                    <widget class="GtkLabel" id="label394">
                      <property name="visible">True</property>
-                     <property name="label" 
translatable="yes">&lt;b&gt;Artwork&lt;/b&gt;</property>
+                     <property name="label" 
translatable="yes">&lt;b&gt;Coverart&lt;/b&gt;</property>
                      <property name="use_underline">False</property>
                      <property name="use_markup">True</property>
                      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9404,18 +9404,39 @@
                          <property name="spacing">0</property>
 
                          <child>
-                           <widget class="GtkCheckButton" id="coverart">
+                           <widget class="GtkCheckButton" id="coverart_apic">
+                             <property name="visible">True</property>
+                             <property name="tooltip" translatable="yes">Music 
files can have images embedded in the APIC tag. Currently this is only 
supported for MP3 files.</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">Read 
coverart from embedded APIC data</property>
+                             <property name="use_underline">True</property>
+                             <property 
name="relief">GTK_RELIEF_NORMAL</property>
+                             <property name="focus_on_click">True</property>
+                             <property name="active">False</property>
+                             <property name="inconsistent">False</property>
+                             <property name="draw_indicator">True</property>
+                             <signal name="toggled" 
handler="on_coverart_apic_toggled" last_modification_time="Mon, 18 Sep 2006 
06:14:57 GMT"/>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
+
+                         <child>
+                           <widget class="GtkCheckButton" id="coverart_file">
                              <property name="visible">True</property>
                              <property name="tooltip" 
translatable="yes">artist: %a, album: %A, composer: %c, title: %t, genre: %G, 
track nr: %T, CD nr: %C, year: %Y, skip data: %*, the character '%': %%. You 
can separate several templates by a ';'. The first one matching the filename 
will be used. Example: '%a - %A/%T %t.mp3;%t.wav'.</property>
                              <property name="can_focus">True</property>
-                             <property name="label" translatable="yes">Add 
artwork from file using the following template</property>
+                             <property name="label" translatable="yes">Add 
coverart from file using the following template</property>
                              <property name="use_underline">True</property>
                              <property 
name="relief">GTK_RELIEF_NORMAL</property>
                              <property name="focus_on_click">True</property>
                              <property name="active">False</property>
                              <property name="inconsistent">False</property>
                              <property name="draw_indicator">True</property>
-                             <signal name="toggled" 
handler="on_coverart_toggled" last_modification_time="Sat, 10 Dec 2005 13:46:30 
GMT"/>
+                             <signal name="toggled" 
handler="on_coverart_file_toggled" last_modification_time="Mon, 18 Sep 2006 
06:14:44 GMT"/>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -9826,7 +9847,28 @@
                          </child>
 
                          <child>
-                           <placeholder/>
+                           <widget class="GtkLabel" id="label436">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">If both 
options are selected, embedded APIC data takes precedence.</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">4</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
                          </child>
                        </widget>
                        <packing>


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to