[Gphoto-user] patch to enable audio file support with Canon driver

[Sean D. <se...@da...>]

I found that support for pulling audio files from the Canon driver stopped
working in 2.1.4, though it did work in the past.  It looks like there was
an attempt to do something smarter for audio pulling, but in the process the
audio files were pulled out of the grand list of files.

The following patch fixes this, and works with libgphoto 2.1.4head.  It is a
very simple patch, so please included it in the next release.



Index: camlibs/canon/canon.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/gphoto/libgphoto2/camlibs/canon/canon.c,v
retrieving revision 1.246
diff -u -u -r1.246 canon.c
--- camlibs/canon/canon.c       1 Jul 2004 12:33:38 -0000       1.246
+++ camlibs/canon/canon.c       23 Jul 2004 14:40:24 -0000
@@ -1942,7 +1942,8 @@
                                         */
                                        if (!camera->pl->list_all_files
                                            && !is_image (info.file.name)
-                                           && !is_movie (info.file.name)) {
+                                           && !is_movie (info.file.name)
+                                           && !is_audio (info.file.name)) {
                                                 /* FIXME: Find associated
main file and add it there */
                                                /* do nothing */
                                                GP_DEBUG ("Ignored %s/%s",
folder,



--=20
__________________________________________________________________

Sean Dague                                       Mid-Hudson Valley
sean at dague dot net                            Linux Users Group
http://dague.net                                 http://mhvlug.org

There is no silver bullet.  Plus, werewolves make better neighbors
than zombies, and they tend to keep the vampire population down.
__________________________________________________________________