Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16228
Modified Files:
ChangeLog_detailed INSTALL TODOandBUGS.txt configure.in
gtkpod.glade
Log Message:
* INSTALL
configure.in
src/Makefile.am
src/autodetection.c (new)
src/autodetection.h (new)
src/display_itdb.h
src/file_convert.c
src/file_itunesdb.c
src/misc.c
src/misc.h
src/misc_input.c
src/tools.c:
Autodetection and auto-loading of iPods. This loads iPods
automatically on start-up when they are connected or later
when they are mounted. Uses gnome-vfs for detection of
mounted volumes and HAL for determining if the mounted
volume is an iPod. Works fine without HAL, and compiles fine
without gnome-vfs, but without autodection facility.
iPod repositories are added automatically when necessary and
removed when ejecting an iPod. Preferences referring to an
iPod are saved into the iTunes directory (gtkpod.prefs).
gtkpod.glade
src/prefs_windows.c:
src/prefs.c
- removed old auto-import functionality. Auto-import is no
longer supported without gnome-vfs. Code to support
automounting on KDE should be easy to add -- please
contribute.
src/prefs.c
src/prefs.h:
- new code to save/load temporary preferences to an
aribtrary file (temp_prefs_load/save(), used by
load/save_ipod_prefs() in misc.c).
- new code to create a subset of keys from the prefs
structure.
Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -d -r1.434 -r1.435
--- ChangeLog_detailed 10 May 2007 15:18:35 -0000 1.434
+++ ChangeLog_detailed 11 May 2007 15:41:49 -0000 1.435
@@ -1,3 +1,48 @@
+2007-05-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * INSTALL
+ configure.in
+ src/Makefile.am
+ src/autodetection.c (new)
+ src/autodetection.h (new)
+ src/display_itdb.h
+ src/file_convert.c
+ src/file_itunesdb.c
+ src/misc.c
+ src/misc.h
+ src/misc_input.c
+ src/tools.c:
+
+ Autodetection and auto-loading of iPods. This loads iPods
+ automatically on start-up when they are connected or later
+ when they are mounted. Uses gnome-vfs for detection of
+ mounted volumes and HAL for determining if the mounted
+ volume is an iPod. Works fine without HAL, and compiles fine
+ without gnome-vfs, but without autodection facility.
+
+ iPod repositories are added automatically when necessary and
+ removed when ejecting an iPod. Preferences referring to an
+ iPod are saved into the iTunes directory (gtkpod.prefs).
+
+
+ gtkpod.glade
+ src/prefs_windows.c:
+ src/prefs.c
+ - removed old auto-import functionality. Auto-import is no
+ longer supported without gnome-vfs. Code to support
+ automounting on KDE should be easy to add -- please
+ contribute.
+
+
+ src/prefs.c
+ src/prefs.h:
+ - new code to save/load temporary preferences to an
+ aribtrary file (temp_prefs_load/save(), used by
+ load/save_ipod_prefs() in misc.c).
+ - new code to create a subset of keys from the prefs
+
+ structure.
+
2007-05-10 Jorg Schuler <jcsjcs at users.sourceforge.net>
* src/prefs.c (prefs_create_subset): removed double-lock of
Index: INSTALL
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/INSTALL,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- INSTALL 7 Jan 2007 01:30:34 -0000 1.14
+++ INSTALL 11 May 2007 15:41:49 -0000 1.15
@@ -41,8 +41,12 @@
Optional packages:
- gettext (for internationalization)
libmpv4 (for AAC/M4A support)
+ libvorbis (for ogg libvorbis support)
+ libflac (for FLAC support)
+ libcurl (for coverart download support)
+ libgnome-vfs-2.0 >2.6 (for iPod autodetection under GNOME)
+ libhal >0.5 <0.6 (in combination with libgnome-vfs: better detection of
iPods)
2. If you install libraries to /usr/local/lib please don't forget to
Index: TODOandBUGS.txt
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/TODOandBUGS.txt,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- TODOandBUGS.txt 6 May 2007 14:16:13 -0000 1.93
+++ TODOandBUGS.txt 11 May 2007 15:41:49 -0000 1.94
@@ -1,5 +1,7 @@
BUGS, TODO:
+- when auto-loading iPods: set backup path if not set.
+
- move part of free-space-update to file_convert.c
- make it impossible to add tracks to an iPod that's not loaded.
Index: configure.in
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/configure.in,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- configure.in 27 Apr 2007 15:50:43 -0000 1.100
+++ configure.in 11 May 2007 15:41:49 -0000 1.101
@@ -79,10 +79,6 @@
,
AC_MSG_ERROR([*** id3tag >= 0.15 lib not found (0.14 will not work!)]))
-# was needed for podcast fetch -- disabled.
-# AC_CHECK_LIB([curl], [curl_easy_init], ,
-# AC_MSG_ERROR([*** curl lib not found!]))
-
dnl Check for libcurl
PKG_CHECK_MODULES(CURL, [libcurl >= 7.10.0], have_curl=yes, have_curl=no)
if test "$have_curl" != "no"; then
@@ -93,8 +89,50 @@
LDFLAGS="$LDFLAGS $CURL_LIBS"
else
echo "*** libcurl could not be found, not building coverart download
support"
- have_curl="no -- will build without coverart download support"
+ have_curl="*no -- will build without coverart download support"
+fi
+
+dnl Check for gnome-vfs
+AC_ARG_WITH(gnome-vfs,
+ AC_HELP_STRING([--without-gnome-vfs],[Disable autodetection
support]))
+if test "x$with_gnome_vfs" != "xno"; then
+ PKG_CHECK_MODULES(GNOME_VFS, [gnome-vfs-2.0 >= 2.6.0], enable_gnome_vfs=yes,
enable_gnome_vfs=no)
+ if test "x$enable_gnome_vfs" != "xyes" -a "x$with_gnome_vfs" = "xyes"; then
+ AC_MSG_ERROR([gnome-vfs support explicitly requested but gnome-vfs
couldn't be found])
+ fi
fi
+if test "x$enable_gnome_vfs" = "xyes"; then
+ have_gnomevfs="yes -- will build with automount support"
+ AC_DEFINE(HAVE_GNOME_VFS, 1, [Define if you have gnome-vfs support])
+ CPPFLAGS="$CPPFLAGS $GNOME_VFS_CFLAGS"
+ CFLAGS="$CFLAGS $GNOME_VFS_CFLAGS"
+ LDFLAGS="$LDFLAGS $GNOME_VFS_LIBS"
+else
+ echo "*** gnome-vfs-2 not found or disabled, not building iPod
autodetection support"
+ have_gnomevfs="*no -- will build without iPod autodetection support"
+fi
+AM_CONDITIONAL(HAVE_GNOME_VFS, test x"$enable_gnome_vfs" = xyes)
+
+#dnl Check for HAL
+AC_ARG_WITH(hal,
+ AC_HELP_STRING([--without-hal],[Disable HAL support]))
+if test "x$with_hal" != "xno"; then
+ PKG_CHECK_MODULES(HAL, hal >= 0.5 hal < 0.6, enable_hal=yes, enable_hal=no)
+ if test "x$enable_hal" != "xyes" -a "x$with_hal" = "xyes"; then
+ AC_MSG_ERROR([HAL support explicitly requested but HAL couldn't be
found])
+ fi
+fi
+if test "x$enable_hal" = "xyes"; then
+ have_hal="yes -- will build with HAL support"
+ AC_DEFINE(HAVE_HAL, 1, [Define if you want HAL support])
+ CPPFLAGS="$CPPFLAGS $HAL_CFLAGS"
+ CFLAGS="$CFLAGS $HAL_CFLAGS"
+ LDFLAGS="$LDFLAGS $HAL_LIBS"
+else
+ have_hal="*no -- will build without HAL support"
+fi
+AM_CONDITIONAL(HAVE_HAL, test x"$enable_hal" = xyes)
+
dnl Check for libmp4v2 (and mp4.h)
AC_SEARCH_LIBS(MP4FileInfo,
@@ -104,7 +142,7 @@
[echo "*** mp4.h cannot be found. Check your mp4v2 installation."])])
if test "y$have_mp4v2" = "y"; then
- have_mp4v2="*** no -- will build without aac support"
+ have_mp4v2="*no -- will build without aac support"
fi
dnl Check for libvorbisfile
@@ -114,7 +152,7 @@
[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"
+ have_vorbisfile="*no -- will build without ogg support"
fi
dnl Check for FLAC
@@ -124,7 +162,7 @@
[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"
+ have_flac="*no -- will build without FLAC support"
fi
dnl Additional libs maybe needed when compiling under solaris
@@ -148,16 +186,17 @@
Host System Type .....: $host
Install path .........: $prefix
- Preprocessor .........: $CC $CPPFLAGS
- Compiler .............: $CC $CFLAGS $PACKAGE_CFLAGS
- Linker ...............: $CC $LDFLAGS $LIBS $PACKAGE_LIBS
GTK2 version .........: `pkg-config gtk+-2.0 --modversion`
GLib2/GThread version : `pkg-config gthread-2.0 --modversion`
- id3tag lib ...........: yes
+ gnome-vfs.............: $have_gnomevfs
+ hal...................: $have_hal
libcurl ..............: $have_curl
mp4v2 ................: $have_mp4v2
vorbisfile ...........: $have_vorbisfile
FLAC .................: $have_flac
+ Preprocessor .........: $CC $CPPFLAGS
+ Compiler .............: $CC $CFLAGS $PACKAGE_CFLAGS
+ Linker ...............: $CC $LDFLAGS $LIBS $PACKAGE_LIBS
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.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- gtkpod.glade 6 May 2007 14:16:13 -0000 1.235
+++ gtkpod.glade 11 May 2007 15:41:49 -0000 1.236
@@ -8245,120 +8245,7 @@
</child>
<child>
- <widget class="GtkVBox" id="vbox112">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label253">
- <property name="visible">True</property>
- <property name="label"
translatable="yes"><b>Import</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.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="GtkHBox" id="hbox107">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">8</property>
-
- <child>
- <widget class="GtkLabel" id="label254">
- <property name="visible">True</property>
- <property name="label"> </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="GtkVBox" id="vbox113">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <placeholder/>
- </child>
-
- <child>
- <placeholder/>
- </child>
-
- <child>
- <widget class="GtkCheckButton"
id="cfg_autoimport">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label"
translatable="yes">Automatically import iTunesDBs on startup</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_cfg_autoimport_toggled" last_modification_time="Thu, 14 Apr 2005
19:38:15 GMT"/>
- </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>
+ <placeholder/>
</child>
<child>
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
