Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30358
Modified Files:
ChangeLog ChangeLog_detailed TODOandBUGS.txt configure.in
gtkpod.glade
Log Message:
* scripts/convert-flac2mp3.sh
scripts/convert-ogg2mp3.sh
src/file_convert.[ch]
src/flacfile.[ch]
src/oggfile.[ch]: new files for patch mentioned below
configure.in
gtkpod.glade
scripts/Makefile.am
src/Makefile.am
src/display_itdb.h
src/display_tracks.c
src/file.c
src/file.h
src/file_itunesdb.c
src/misc.c
src/misc.h
src/misc_conversion.c
src/misc_track.c
src/prefs.c
src/prefs_window.c
src/repository.c
src/syncdir.c
src/tools.c: combined patch by Marc d[r]eadlock and Simon
Naunton for on-the fly conversion of FLAC and OGG files
during export to the iPod, plus some patches thrown in by
myself. Thanks for the contribution!
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- ChangeLog 22 Nov 2006 15:54:37 -0000 1.191
+++ ChangeLog 16 Jan 2007 09:44:58 -0000 1.192
@@ -2,6 +2,9 @@
NEW FEATURE: lastfm support. Thanks to Anant Narayanan.
+ NEW FEATURE: on-the-fly conversion of FLAC and OGG files during
+ export to the iPod. Thanks to Marc d[readlock] and Simon Naunton!
+
gtkpod V0.99.8
NEW FEATURE: Support of several iPods (currently you need to
Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -d -r1.357 -r1.358
--- ChangeLog_detailed 15 Jan 2007 13:21:18 -0000 1.357
+++ ChangeLog_detailed 16 Jan 2007 09:44:58 -0000 1.358
@@ -1,5 +1,35 @@
2007-01-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+ * scripts/convert-flac2mp3.sh
+ scripts/convert-ogg2mp3.sh
+ src/file_convert.[ch]
+ src/flacfile.[ch]
+ src/oggfile.[ch]: new files for patch mentioned below
+
+ configure.in
+ gtkpod.glade
+ scripts/Makefile.am
+ src/Makefile.am
+ src/display_itdb.h
+ src/display_tracks.c
+ src/file.c
+ src/file.h
+ src/file_itunesdb.c
+ src/misc.c
+ src/misc.h
+ src/misc_conversion.c
+ src/misc_track.c
+ src/prefs.c
+ src/prefs_window.c
+ src/repository.c
+ src/syncdir.c
+ src/tools.c: combined patch by Marc d[r]eadlock and Simon
+ Naunton for on-the fly conversion of FLAC and OGG files
+ during export to the iPod, plus some patches thrown in by
+ myself. Thanks for the contribution!
+
+2007-01-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
* po/ja.po: updated Japanese catalog -- thanks to Kentaro Fukuchi
2007-01-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
Index: TODOandBUGS.txt
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/TODOandBUGS.txt,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- TODOandBUGS.txt 16 Jan 2007 03:23:00 -0000 1.85
+++ TODOandBUGS.txt 16 Jan 2007 09:44:58 -0000 1.86
@@ -1,4 +1,6 @@
-, TODO:
+BUGS, TODO:
+
+- fileselection_select_script(): display @additional_text.
- modify "warning" when matching checksums: Send a patch that changes
the behavior from printing into the info window to opening a dialog
Index: configure.in
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/configure.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- configure.in 28 Nov 2006 00:38:56 -0000 1.95
+++ configure.in 16 Jan 2007 09:44:58 -0000 1.96
@@ -104,6 +104,26 @@
have_mp4v2="*** no -- will build without aac support"
fi
+dnl Check for libvorbisfile
+AC_SEARCH_LIBS(ov_open,
+ ["vorbisfile"],
+ [AC_CHECK_HEADER(vorbis/vorbisfile.h,
+ [have_vorbisfile="yes -- will build with ogg support"
AC_DEFINE_UNQUOTED(HAVE_LIBVORBISFILE, 1, ["Define to 1 if you have the ogg
library"])],
+ [echo "*** vorbisfile.h cannot be found. Check your ogg/vorbis
installation."])])
+if test "y$have_vorbisfile" = "y"; then
+ have_vorbisfile="*** no -- will build without ogg support"
+fi
+
+dnl Check for FLAC
+AC_SEARCH_LIBS(FLAC__metadata_get_streaminfo,
+ ["FLAC"],
+ [AC_CHECK_HEADER(FLAC/metadata.h,
+ [have_flac="yes -- will build with FLAC support"
AC_DEFINE_UNQUOTED(HAVE_FLAC, 1, ["Define to 1 if you have the flac library"])],
+ [echo "*** FLAC/metadata.h cannot be found. Check your FLAC
installation."])])
+if test "y$have_flac" = "y"; then
+ have_flac="*** no -- will build without FLAC support"
+fi
+
dnl Additional libs maybe needed when compiling under solaris
AC_SEARCH_LIBS(bind,
["socket" "nsl" "socket -lnsl"])
@@ -133,7 +153,8 @@
id3tag lib ...........: yes
libcurl ..............: $have_curl
mp4v2 ................: $have_mp4v2
- NLS/gettext ..........: $USE_NLS
+ vorbisfile ...........: $have_vorbisfile
+ FLAC .................: $have_flac
Now type 'make' to build $PACKAGE $VERSION,
and then 'make install' for installation.
Index: gtkpod.glade
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- gtkpod.glade 22 Nov 2006 15:54:37 -0000 1.217
+++ gtkpod.glade 16 Jan 2007 09:44:58 -0000 1.218
@@ -13284,6 +13284,266 @@
<property name="fill">True</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox174">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkLabel" id="label432">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes"><b>On-the-fly Conversion</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</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</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="GtkVBox" id="vbox175">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox205">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</property>
+
+ <child>
+ <widget class="GtkLabel" id="label437">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">
</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="GtkLabel" id="label436">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Ogg
with :</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="path_conv_ogg_entry">
+ <property name="visible">True</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="path_conv_ogg_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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox178">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox206">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</property>
+
+ <child>
+ <widget class="GtkLabel" id="label448">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">
</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="GtkLabel" id="label449">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Flac
with :</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="path_conv_flac_entry">
+ <property name="visible">True</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="path_conv_flac_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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="tab_expand">False</property>
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
