[Pkg-gtkpod-devel] r111 - in libgpod/branches/upstream/current: .
bindings/python bindings/python/examples po src
Frank Lichtenheld
djpig at costa.debian.org
Sat Apr 8 18:42:37 UTC 2006
Author: djpig
Date: 2006-04-08 18:42:34 +0000 (Sat, 08 Apr 2006)
New Revision: 111
Added:
libgpod/branches/upstream/current/po/es.gmo
libgpod/branches/upstream/current/po/es.po
Modified:
libgpod/branches/upstream/current/ChangeLog
libgpod/branches/upstream/current/bindings/python/examples/play.py
libgpod/branches/upstream/current/bindings/python/examples/tag-genre-from-audioscrobber.py
libgpod/branches/upstream/current/bindings/python/gpod.i
libgpod/branches/upstream/current/compile
libgpod/branches/upstream/current/config.guess
libgpod/branches/upstream/current/config.sub
libgpod/branches/upstream/current/configure
libgpod/branches/upstream/current/configure.ac
libgpod/branches/upstream/current/depcomp
libgpod/branches/upstream/current/install-sh
libgpod/branches/upstream/current/missing
libgpod/branches/upstream/current/mkinstalldirs
libgpod/branches/upstream/current/po/ja.gmo
libgpod/branches/upstream/current/po/ja.po
libgpod/branches/upstream/current/src/db-artwork-writer.c
libgpod/branches/upstream/current/src/db-itunes-parser.h
libgpod/branches/upstream/current/src/ipod-device.c
libgpod/branches/upstream/current/src/itdb_itunesdb.c
libgpod/branches/upstream/current/src/itdb_playlist.c
libgpod/branches/upstream/current/src/ithumb-writer.c
Log:
Load /tmp/tmp.6TWDMc/libgpod-0.3.2 into
libgpod/branches/upstream/current.
Modified: libgpod/branches/upstream/current/ChangeLog
===================================================================
--- libgpod/branches/upstream/current/ChangeLog 2006-03-01 00:12:42 UTC (rev 110)
+++ libgpod/branches/upstream/current/ChangeLog 2006-04-08 18:42:34 UTC (rev 111)
@@ -1,3 +1,71 @@
+2005-02-04 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * configure.ac: bumped version to 0.3.2 for release.
+
+ * db-artwork-writer.c: increased IPOD_MMAP_SIZE from 2 to 16 MB as
+ a temporary workaround until a propoer solution can be
+ implemented.
+
+ * db-itunes-parser.h: replaced the #pragma pack(4) with an
+ 'packed' attribute on _MhiiHeader only.
+
+2005-02-28 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * ipod-device.c: (ipod_device_set_property): fixed possible
+ segfault when hald is present.
+
+2005-02-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * configure.ac, po/es.po: added Spanish translation catalog
+ (thanks to Azael Avalos)
+
+2005-02-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * libgpod-1.0.pc: added gobject-2.0 to 'Requires:' list
+
+ * src/db-itunes-parser.h: add '#pragma pack(4)' to fix 64bit issue
+ with padding (at least as a temporary fix).
+
+ * src/ipod-device.c: added HP type color photo ipod 'S492'. Thanks
+ to David Desrosiers.
+
+2005-02-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * po/ja.po: updated Japanese catalog -- thanks to Kentaro Fukuchi
+
+ * src/ipod-device.c: (ipod_device_set_property): fixed bug that
+ caused ipod-detection to fail if hal daemon was not running. As
+ a consequence cover art was not written to the iPod.
+
+2005-02-04 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_itunesdb.c: (itunesstats_read) Fixed error when reading
+ the Shuffle's stat file (0x18 was used as minimal record length
+ instead of decimal '18').
+
+2005-02-03 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_itunesdb.c, src/itdb_playlist.c, src/ithumb-writer.c:
+ removed nested-functions. Thanks to Brian Jackson for the patch
+ (he was not the only to send patches -- please, nobody feel
+ offended that I didn't act sooner).
+
+2005-01-03 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/ipod-device.c: (ipod_device_set_property) check hal_context
+ before accessing it to avoid segfault when hald is not running.
+
+ (ipod_device_hal_initialize) fixed memory leak: 'error' was not
+ freed if libhal_ctx_init() failed.
+
+ (ipod_device_get_model_index_from_table): fix warning about
+ unused computed value (thanks to Martin Aumueller)
+
+2005-12-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/ipod-device.c: don't ignore return value of
+ fread/fwrite/ftell because of possible compiler warnings.
+
2005-12-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
* src/itdb_artwork.c: (itdb_thumb_get_gdk_pixbuf) allow to get
@@ -9,6 +77,8 @@
* bumped version to 0.3.0 for release.
+ * bumped version to 0.3.1 for CVS version.
+
2005-12-10 Jorg Schuler <jcsjcs at users.sourceforge.net>
* src/ithumb-writer.c: fixed typo leading to segfault.
Property changes on: libgpod/branches/upstream/current/bindings/python/examples/play.py
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: libgpod/branches/upstream/current/bindings/python/examples/tag-genre-from-audioscrobber.py
___________________________________________________________________
Name: svn:executable
-
+ *
Modified: libgpod/branches/upstream/current/bindings/python/gpod.i
===================================================================
--- libgpod/branches/upstream/current/bindings/python/gpod.i 2006-03-01 00:12:42 UTC (rev 110)
+++ libgpod/branches/upstream/current/bindings/python/gpod.i 2006-04-08 18:42:34 UTC (rev 111)
@@ -21,7 +21,7 @@
License along with this code; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- $Id: gpod.i,v 1.6 2005/11/27 19:05:02 nicholas Exp $
+ $Id: gpod.i,v 1.7 2006/02/25 23:16:40 nicholas Exp $
Please send any fixes, improvements or suggestions to
<nick-gtkpod at nickpiper co uk>.
@@ -44,7 +44,7 @@
GList *l;
list = PyList_New(g_list_length(itdb->tracks));
for (l = itdb->tracks, i = 0; l; l = l->next, ++i) {
- PyList_SET_ITEM(list, i, SWIG_NewPointerObj((void*)(l->data), SWIGTYPE_p_Itdb_Track, 0));
+ PyList_SET_ITEM(list, i, SWIG_NewPointerObj((void*)(l->data), SWIGTYPE_p__Itdb_Track, 0));
}
return list;
}
@@ -55,7 +55,7 @@
GList *l;
list = PyList_New(g_list_length(pl->members));
for (l = pl->members, i = 0; l; l = l->next, ++i) {
- PyList_SET_ITEM(list, i, SWIG_NewPointerObj((void*)(l->data), SWIGTYPE_p_Itdb_Track, 0));
+ PyList_SET_ITEM(list, i, SWIG_NewPointerObj((void*)(l->data), SWIGTYPE_p__Itdb_Track, 0));
}
return list;
}
@@ -66,7 +66,7 @@
GList *l;
list = PyList_New(g_list_length(itdb->playlists));
for (l = itdb->playlists, i = 0; l; l = l->next, ++i) {
- PyList_SET_ITEM(list, i, SWIG_NewPointerObj((void*)(l->data), SWIGTYPE_p_Itdb_Playlist, 0));
+ PyList_SET_ITEM(list, i, SWIG_NewPointerObj((void*)(l->data), SWIGTYPE_p__Itdb_Playlist, 0));
}
return list;
}
Property changes on: libgpod/branches/upstream/current/compile
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: libgpod/branches/upstream/current/config.guess
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: libgpod/branches/upstream/current/config.sub
___________________________________________________________________
Name: svn:executable
-
+ *
Modified: libgpod/branches/upstream/current/configure
===================================================================
--- libgpod/branches/upstream/current/configure 2006-03-01 00:12:42 UTC (rev 110)
+++ libgpod/branches/upstream/current/configure 2006-04-08 18:42:34 UTC (rev 111)
@@ -1553,7 +1553,7 @@
#
LIBGPOD_MAJOR_VERSION=0
LIBGPOD_MINOR_VERSION=3
-LIBGPOD_MICRO_VERSION=0
+LIBGPOD_MICRO_VERSION=2
LIBGPOD_INTERFACE_AGE=0
# If you need a modifier for the version number.
# Normally empty, but can be used to make "fixup" releases.
@@ -20159,7 +20159,7 @@
-ALL_LINGUAS="de fr he it ja sv"
+ALL_LINGUAS="de es fr he it ja sv"
GETTEXT_PACKAGE=libgpod
Property changes on: libgpod/branches/upstream/current/configure
___________________________________________________________________
Name: svn:executable
-
+ *
Modified: libgpod/branches/upstream/current/configure.ac
===================================================================
--- libgpod/branches/upstream/current/configure.ac 2006-03-01 00:12:42 UTC (rev 110)
+++ libgpod/branches/upstream/current/configure.ac 2006-04-08 18:42:34 UTC (rev 111)
@@ -13,7 +13,7 @@
#
LIBGPOD_MAJOR_VERSION=0
LIBGPOD_MINOR_VERSION=3
-LIBGPOD_MICRO_VERSION=0
+LIBGPOD_MICRO_VERSION=2
LIBGPOD_INTERFACE_AGE=0
# If you need a modifier for the version number.
# Normally empty, but can be used to make "fixup" releases.
@@ -99,7 +99,7 @@
dnl **************************************************
dnl * internationalization support
dnl **************************************************
-ALL_LINGUAS="de fr he it ja sv"
+ALL_LINGUAS="de es fr he it ja sv"
GETTEXT_PACKAGE=libgpod
AC_SUBST(GETTEXT_PACKAGE)
Property changes on: libgpod/branches/upstream/current/depcomp
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: libgpod/branches/upstream/current/install-sh
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: libgpod/branches/upstream/current/missing
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: libgpod/branches/upstream/current/mkinstalldirs
___________________________________________________________________
Name: svn:executable
-
+ *
Added: libgpod/branches/upstream/current/po/es.gmo
===================================================================
(Binary files differ)
Property changes on: libgpod/branches/upstream/current/po/es.gmo
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: libgpod/branches/upstream/current/po/es.po
===================================================================
--- libgpod/branches/upstream/current/po/es.po 2006-03-01 00:12:42 UTC (rev 110)
+++ libgpod/branches/upstream/current/po/es.po 2006-04-08 18:42:34 UTC (rev 111)
@@ -0,0 +1,238 @@
+# translation of es.po to Español
+# Azael Avalos <coproscefalo at gmail.com>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: es\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-09-14 21:51+0900\n"
+"PO-Revision-Date: 2006-02-23 14:42-0700\n"
+"Last-Translator: Azael Avalos\n"
+"Language-Team: Español\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: KBabel 1.11.2\n"
+
+#: ../src/itdb_itunesdb.c:313
+#, c-format
+msgid "Illegal seek to offset %ld (length %ld) in file '%s'."
+msgstr "Busqueda ilegal en el offset %ld (tamaño %ld) en el archivo '%s'."
+
+#: ../src/itdb_itunesdb.c:521
+#, c-format
+msgid "Not a Play Counts file: '%s' (missing mhdp header)."
+msgstr "No es un archivo de Cuentas de Reproducción: '%s' (falta el encabezado mhdp)."
+
+#: ../src/itdb_itunesdb.c:535
+#, c-format
+msgid "Play Counts file ('%s'): header length smaller than expected (%d<96)."
+msgstr "El archivo de Cuentas de Reproducción ('%s'): el tamaño del encabezado es mas pequeño de lo esperado (%d<96)."
+
+#: ../src/itdb_itunesdb.c:548
+#, c-format
+msgid "Play Counts file ('%s'): entry length smaller than expected (%d<12)."
+msgstr "El archivo de Cuentas de Reproducción ('%s'): el tamaño de la entrada es mas pequeña de lo esperado (%d<12)."
+
+#: ../src/itdb_itunesdb.c:803
+#, c-format
+msgid "iTunesDB corrupt: no MHOD at offset %ld in file '%s'."
+msgstr "iTunesDB corrupta: no se encontró MHOD en el offset %ld del archivo '%s'."
+
+#: ../src/itdb_itunesdb.c:923
+#, c-format
+msgid ""
+"Length of smart playlist rule field (%d) not as expected. Trying to continue "
+"anyhow.\n"
+msgstr "El tamaño de el campo de reglas de la lista de reproducción inteligente (%d) no es el esperado. Intentando continuar de todas formas.\n"
+
+#: ../src/itdb_itunesdb.c:966
+#, fuzzy
+msgid "Did not find SLst hunk as expected. Trying to continue.\n"
+msgstr "No se encontró el SLst hunk como se esperaba. Intentando continuar.\n"
+
+#: ../src/itdb_itunesdb.c:972
+#, c-format
+msgid ""
+"Encountered unknown MHOD type (%d) while parsing the iTunesDB. Ignoring.\n"
+"\n"
+msgstr ""
+"Se encontró un tipo desconocido de MHOD (%d) al intentar análizar el iTunesDB. Ignorando.\n"
+"\n"
+
+#: ../src/itdb_itunesdb.c:1053 ../src/itdb_itunesdb.c:1744
+#: ../src/itdb_itunesdb.c:1779
+#, c-format
+#, fuzzy
+msgid "iTunesDB corrupt: hunk length 0 for hunk at %ld in file '%s'."
+msgstr "iTunesDB corrupta: el tamaño del hunk es 0 en el hunk %ld en el archivo '%s'."
+
+#: ../src/itdb_itunesdb.c:1148
+msgid "Master-PL"
+msgstr "Lista de Reproducción Maestra"
+
+#: ../src/itdb_itunesdb.c:1150
+msgid "Playlist"
+msgstr "Lista de Reproducción"
+
+#: ../src/itdb_itunesdb.c:1175
+#, c-format
+msgid "iTunesDB corrupt: found mhyp at %ld in file '%s'."
+msgstr "iTunesDB corrupta: se encontró mhyp en %ld en el archivo '%s'."
+
+#: ../src/itdb_itunesdb.c:1223
+#, c-format
+msgid "Itdb_Track ID '%d' not found.\n"
+msgstr "No se encontró el ID '%d' del Itdb_Track.\n"
+
+#: ../src/itdb_itunesdb.c:1487
+msgid "OTG Playlist"
+msgstr "Lista de Reproducción OTG"
+
+#: ../src/itdb_itunesdb.c:1501
+#, c-format
+msgid "Not a OTG playlist file: '%s' (missing mhpo header)."
+msgstr "No es un archivo de la lista de reproducción OTG: '%s' (falta el encabezado mhpo)."
+
+#: ../src/itdb_itunesdb.c:1515
+#, c-format
+msgid "OTG playlist file ('%s'): header length smaller than expected (%d<20)."
+msgstr "El archivo de la lista de reproducción OTG ('%s'): el tamaño del encabezado es mas pequeño de lo esperado (%d<20)."
+
+#: ../src/itdb_itunesdb.c:1527
+#, c-format
+msgid "OTG playlist file file ('%s'): entry length smaller than expected (%d<4)."
+msgstr "El archivo de la lista de reproducción OTG ('%s'): el tamaño de la entrada es mas pequeño de lo esperado (%d<4)."
+
+#: ../src/itdb_itunesdb.c:1562
+#, c-format
+msgid "OTG playlist file '%s': reference to non-existent track (%d)."
+msgstr "El archivo de la lista de reproducción OTG '%s': referencia a una pista no existente (%d)."
+
+#: ../src/itdb_itunesdb.c:1607
+#, c-format
+msgid "OTG Playlist %d"
+msgstr "Lista de Reproducción OTG %d"
+
+#: ../src/itdb_itunesdb.c:1650
+#, c-format
+msgid "Not a iTunesDB: '%s' (missing mhdb header)."
+msgstr "No es una iTunesDB: '%s' (falta el encabezado mhdb)."
+
+#: ../src/itdb_itunesdb.c:1666
+#, c-format
+#, fuzzy
+msgid ""
+"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%ld<32). "
+"Aborting."
+msgstr "iTunesDB ('%s'): el tamaño del encabezado mhsd del hunk es mas pequeño del esperado (%ld<32). Abortando."
+
+#: ../src/itdb_itunesdb.c:1698
+#, c-format
+#, fuzzy
+msgid "iTunesDB '%s' corrupt: already found two playlist mhsds -- giving up."
+msgstr "iTunesDB '%s' corrupta: se han encontrado dos lista de reproducción mhsds -- ."
+
+#. this should not be -- issue warning
+#: ../src/itdb_itunesdb.c:1759
+#, fuzzy
+msgid ""
+"iTunesDB possibly corrupt: number of tracks (mhit hunks) inconsistent. "
+"Trying to continue.\n"
+msgstr "iTunesDB posiblemente corrupta: el número de pistas (mhit hunks) es inconsistente. Intentando continuar.\n"
+
+#. this should not be -- issue warning
+#: ../src/itdb_itunesdb.c:1841
+#, fuzzy
+msgid ""
+"iTunesDB possibly corrupt: number of playlists (mhyp hunks) inconsistent. "
+"Trying to continue.\n"
+msgstr "iTunesDB posiblemente corrupta: el número de listas de reproducción (mhyp hunks) es inconsistente. Intentando continuar.\n"
+
+#: ../src/itdb_itunesdb.c:1879
+#, c-format
+msgid "File not found: '%s'."
+msgstr "Archivo no encontrado: '%s'."
+
+#: ../src/itdb_itunesdb.c:2396
+#, c-format
+msgid "Cannot write mhod of type %d\n"
+msgstr "No se pudo escribir mhod del tipo %d\n"
+
+#: ../src/itdb_itunesdb.c:2522 ../src/itdb_itunesdb.c:2635
+msgid "Database in memory corrupt (track pointer == NULL). Aborting export."
+msgstr "La base de datos en la memoria esta corrupta (apuntador de la pista == NULL). Abortando la exportación."
+
+#: ../src/itdb_itunesdb.c:2678
+msgid "Database in memory corrupt (playlist pointer == NULL). Aborting export."
+msgstr "La base de datos en la memoria esta corrupta (apuntador de la lista de reproducción == NULL). Abortando exportación."
+
+#: ../src/itdb_itunesdb.c:2718
+#, c-format
+msgid "Opening of '%s' for writing failed."
+msgstr "Fallo al abrir '%s' para escritura."
+
+#: ../src/itdb_itunesdb.c:2729
+#, c-format
+msgid "Writing to '%s' failed."
+msgstr "Fallo al escribir a '%s'."
+
+#: ../src/itdb_itunesdb.c:2740
+#, c-format
+msgid "Writing to '%s' failed (%s)."
+msgstr "Fallo al escribir a '%s' (%s)."
+
+#: ../src/itdb_itunesdb.c:2881 ../src/itdb_itunesdb.c:3052
+#: ../src/itdb_itunesdb.c:3245 ../src/itdb_itunesdb.c:3451
+#, c-format
+#, fuzzy
+msgid "Path not found: '%s'."
+msgstr "No se encontró: '%s'."
+
+#: ../src/itdb_itunesdb.c:3265
+#, c-format
+msgid "Error renaming '%s' to '%s' (%s)."
+msgstr "Error al renombrar '%s' a '%s' (%s)."
+
+#: ../src/itdb_itunesdb.c:3282
+#, c-format
+msgid "Error removing '%s' (%s)."
+msgstr "Error al remover '%s' (%s)."
+
+#: ../src/itdb_itunesdb.c:3426
+#, c-format
+msgid "No 'F..' directories found in '%s'."
+msgstr "No se encontró ningún directorio 'F..' en '%s'."
+
+#: ../src/itdb_itunesdb.c:3589
+#, c-format
+msgid "Error opening '%s' for reading (%s)."
+msgstr "Error al abrir '%s' para lectura (%s)."
+
+#: ../src/itdb_itunesdb.c:3600
+#, c-format
+msgid "Error opening '%s' for writing (%s)."
+msgstr "Error al abrir '%s' para escritura (%s)."
+
+#: ../src/itdb_itunesdb.c:3617
+#, c-format
+msgid "Error while reading from '%s' (%s)."
+msgstr "Error leyendo de '%s' (%s)."
+
+#: ../src/itdb_itunesdb.c:3633
+#, c-format
+msgid "Error while writing to '%s' (%s)."
+msgstr "Error escribiendo a '%s' (%s)."
+
+#: ../src/itdb_itunesdb.c:3646 ../src/itdb_itunesdb.c:3656
+#, c-format
+msgid "Error when closing '%s' (%s)."
+msgstr "Error al cerrar '%s' (%s)."
+
+#. New action!
+#: ../src/itdb_playlist.c:71
+#, c-format
+msgid "Unknown action (%d) in smart playlist will be ignored.\n"
+msgstr "La acción desconocida (%d) en la lista de reproducción inteligente sera ignorada.\n"
+
Modified: libgpod/branches/upstream/current/po/ja.gmo
===================================================================
(Binary files differ)
Modified: libgpod/branches/upstream/current/po/ja.po
===================================================================
--- libgpod/branches/upstream/current/po/ja.po 2006-03-01 00:12:42 UTC (rev 110)
+++ libgpod/branches/upstream/current/po/ja.po 2006-04-08 18:42:34 UTC (rev 111)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: gtkpod 0.40\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-14 21:51+0900\n"
-"PO-Revision-Date: 2005-06-20 23:25+0900\n"
+"POT-Creation-Date: 2006-02-11 08:51+0900\n"
+"PO-Revision-Date: 2006-02-14 16:48+0900\n"
"Last-Translator: Kentaro Fukuchi <fukuchi at users.sourceforge.net>\n"
"Language-Team: n/a\n"
"MIME-Version: 1.0\n"
@@ -16,209 +16,275 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../src/itdb_itunesdb.c:313
+#: ../src/itdb_itunesdb.c:358
#, c-format
msgid "Illegal seek to offset %ld (length %ld) in file '%s'."
-msgstr ""
+msgstr "ÉÔÀµ¤Ê¥·¡¼¥¯: '%3$s', ¥ª¥Õ¥»¥Ã¥È %1$ld, Ťµ (%2$ld)"
-#: ../src/itdb_itunesdb.c:521
+#: ../src/itdb_itunesdb.c:604
#, c-format
msgid "Not a Play Counts file: '%s' (missing mhdp header)."
-msgstr ""
+msgstr "ºÆÀ¸²ó¿ô¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: '%s' (mhdp ¥Ø¥Ã¥À¤¬Ìµ¤¤)"
-#: ../src/itdb_itunesdb.c:535
+#: ../src/itdb_itunesdb.c:618
#, c-format
msgid "Play Counts file ('%s'): header length smaller than expected (%d<96)."
-msgstr ""
+msgstr "ºÆÀ¸²ó¿ô¥Õ¥¡¥¤¥ë ('%s'): ¥Ø¥Ã¥À¤ÎŤµ¤¬Â¤ê¤Þ¤»¤ó¡£(%d<96)"
-#: ../src/itdb_itunesdb.c:548
+#: ../src/itdb_itunesdb.c:631
#, c-format
msgid "Play Counts file ('%s'): entry length smaller than expected (%d<12)."
-msgstr ""
+msgstr "ºÆÀ¸²ó¿ô¥Õ¥¡¥¤¥ë ('%s'): ¥¨¥ó¥È¥ê¤ÎŤµ¤¬Â¤ê¤Þ¤»¤ó¡£(%d<12)"
-#: ../src/itdb_itunesdb.c:803
+#: ../src/itdb_itunesdb.c:709
#, c-format
+msgid "iTunesStats file ('%s'): entry length smaller than expected (%d<18)."
+msgstr "iTunesStats ¥Õ¥¡¥¤¥ë ('%s'): ¥¨¥ó¥È¥ê¤ÎŤµ¤¬Â¤ê¤Þ¤»¤ó¡£(%d<18)"
+
+#: ../src/itdb_itunesdb.c:986
+#, c-format
msgid "iTunesDB corrupt: no MHOD at offset %ld in file '%s'."
msgstr ""
+"iTunesDB ¤¬²õ¤ì¤Æ¤¤¤Þ¤¹: MHOD ¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£(¥Õ¥¡¥¤¥ë '%2$s', ¥ª¥Õ¥»¥Ã¥È "
+"%1$ld)"
-#: ../src/itdb_itunesdb.c:923
+#: ../src/itdb_itunesdb.c:1128
#, c-format
msgid ""
"Length of smart playlist rule field (%d) not as expected. Trying to continue "
"anyhow.\n"
msgstr ""
+"¥¹¥Þ¡¼¥È¥×¥ì¥¤¥ê¥¹¥È¤Î¥ë¡¼¥ë¤ÎŤµ (%d) ¤¬´üÂÔ¤µ¤ì¤ëŤµ¤È°Û¤Ê¤ê¤Þ¤¹¡£½èÍý¤ò"
+"³¤±¤Þ¤¹¡£\n"
-#: ../src/itdb_itunesdb.c:966
-msgid "Did not find SLst hunk as expected. Trying to continue.\n"
+#: ../src/itdb_itunesdb.c:1160
+#, c-format
+msgid "iTunesDB corrupt: no SLst at offset %ld in file '%s'."
msgstr ""
+"iTunesDB ¤¬²õ¤ì¤Æ¤¤¤Þ¤¹: SLst ¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£(¥Õ¥¡¥¤¥ë '%2$s', ¥ª¥Õ¥»¥Ã¥È "
+"%1$ld)"
-#: ../src/itdb_itunesdb.c:972
+#: ../src/itdb_itunesdb.c:1173
#, c-format
msgid ""
"Encountered unknown MHOD type (%d) while parsing the iTunesDB. Ignoring.\n"
"\n"
msgstr ""
+"iTunesDB ¤ÎÆɤ߹þ¤ßÃæ¤Ë¡¢Ì¤ÃΤΠMHOD ¥¿¥¤¥× (%d) ¤òȯ¸«¤·¤Þ¤·¤¿¡£Ìµ»ë¤·¤Þ"
+"¤¹¡£\n"
+"\n"
-#: ../src/itdb_itunesdb.c:1053 ../src/itdb_itunesdb.c:1744
-#: ../src/itdb_itunesdb.c:1779
+#: ../src/itdb_itunesdb.c:1235
#, c-format
msgid "iTunesDB corrupt: hunk length 0 for hunk at %ld in file '%s'."
msgstr ""
+"iTunesDB ¤¬²õ¤ì¤Æ¤¤¤Þ¤¹: hunk ¤ÎŤµ¤¬ 0 ¤Ç¤¹¡£(¥Õ¥¡¥¤¥ë '%2$s', ¥ª¥Õ¥»¥Ã¥È %"
+"1$ld)"
-#: ../src/itdb_itunesdb.c:1148
-msgid "Master-PL"
+#: ../src/itdb_itunesdb.c:1248
+#, c-format
+msgid ""
+"iTunesDB corrupt: no section '%s' found in section '%s' starting at %ld."
msgstr ""
+"iTunesDB ¤¬²õ¤ì¤Æ¤¤¤Þ¤¹: %3$ld ¤Î°ÌÃ֤ˤ¢¤ë¥»¥¯¥·¥ç¥ó '%2$s' ¤ÎÃæ¤Ë¥»¥¯¥·¥ç"
+"¥ó '%1$s' ¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
-#: ../src/itdb_itunesdb.c:1150
-msgid "Playlist"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È"
+#: ../src/itdb_itunesdb.c:1262
+#, c-format
+msgid ""
+"header length of '%s' smaller than expected (%d < %d) at offset %ld in file "
+"'%s'."
+msgstr "'%1$s' ¤Î¥Ø¥Ã¥À¤ÎŤµ¤¬Â¤ê¤Þ¤»¤ó (%2$d < %3$d) (¥Õ¥¡¥¤¥ë '%5$s', ¥ª¥Õ¥»¥Ã¥È %4$ld)"
-#: ../src/itdb_itunesdb.c:1175
+#: ../src/itdb_itunesdb.c:1343
#, c-format
-msgid "iTunesDB corrupt: found mhyp at %ld in file '%s'."
+msgid "Not a iTunesDB: '%s' (missing mhdb header)."
+msgstr "iTunesDB ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: '%s' (mhdb ¥Ø¥Ã¥À¤¬Ìµ¤¤)"
+
+#: ../src/itdb_itunesdb.c:1359
+#, c-format
+msgid ""
+"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%d<32). "
+"Aborting."
+msgstr "iTunesDB ('%s'): mhsd ¤Î¥Ø¥Ã¥À¤ÎŤµ¤¬Â¤ê¤Þ¤»¤ó(%d<32)¡£Ãæ»ß¤·¤Þ¤¹¡£"
+
+#: ../src/itdb_itunesdb.c:1380
+#, c-format
+msgid "iTunesDB '%s' corrupt: mhsd expected at %ld."
+msgstr "iTunesDB '%s' ¤¬²õ¤ì¤Æ¤¤¤Þ¤¹: mhsd ¤¬ %ld ¤Î°ÌÃ֤˸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£"
+
+#: ../src/itdb_itunesdb.c:1497
+#, c-format
+msgid "Number of MHODs in mhip at %ld inconsistent in file '%s'."
msgstr ""
+"mhip ¤ÎÃæ¤Î MHOD ¤Î¿ô¤¬¿©¤¤°ã¤Ã¤Æ¤¤¤Þ¤¹¡£(¥Õ¥¡¥¤¥ë '%2$s', ¥ª¥Õ¥»¥Ã¥È %1$ld)"
-#: ../src/itdb_itunesdb.c:1223
+#: ../src/itdb_itunesdb.c:1515
#, c-format
msgid "Itdb_Track ID '%d' not found.\n"
+msgstr "Itdb_Track ID '%d' ¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£\n"
+
+#: ../src/itdb_itunesdb.c:1669
+#, c-format
+msgid "Number of MHODs in mhyp at %ld inconsistent in file '%s'."
msgstr ""
+"mhyp ¤ÎÃæ¤Î MHOD ¤Î¿ô¤¬¿©¤¤°ã¤Ã¤Æ¤¤¤Þ¤¹¡£(¥Õ¥¡¥¤¥ë '%2$s', ¥ª¥Õ¥»¥Ã¥È %1$ld)"
-#: ../src/itdb_itunesdb.c:1487
-msgid "OTG Playlist"
+#: ../src/itdb_itunesdb.c:1679
+msgid "Master-PL"
msgstr ""
-#: ../src/itdb_itunesdb.c:1501
+#: ../src/itdb_itunesdb.c:1683
+msgid "Podcasts"
+msgstr ""
+
+#: ../src/itdb_itunesdb.c:1685
+msgid "Playlist"
+msgstr "¥×¥ì¥¤¥ê¥¹¥È"
+
+#: ../src/itdb_itunesdb.c:1707
#, c-format
-msgid "Not a OTG playlist file: '%s' (missing mhpo header)."
+msgid ""
+"iTunesDB corrupt: number of mhip sections inconsistent in mhyp starting at %"
+"ld in file '%s'."
msgstr ""
+"iTunesDB ¤¬²õ¤ì¤Æ¤¤¤Þ¤¹: mhyp ¤ÎÃæ¤Î mhip ¥»¥¯¥·¥ç¥ó¤Î¿ô¤¬¿©¤¤°ã¤Ã¤Æ¤¤¤Þ¤¹¡£"
+"(¥Õ¥¡¥¤¥ë '%2$s', ¥ª¥Õ¥»¥Ã¥È %1$ld)"
-#: ../src/itdb_itunesdb.c:1515
+#: ../src/itdb_itunesdb.c:1981
+msgid "OTG Playlist"
+msgstr "OTG ¥×¥ì¥¤¥ê¥¹¥È"
+
+#: ../src/itdb_itunesdb.c:1995
#, c-format
+msgid "Not a OTG playlist file: '%s' (missing mhpo header)."
+msgstr "OTG ¥×¥ì¥¤¥ê¥¹¥È¤Î¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: '%s' (mhpo ¥Ø¥Ã¥À¤¬Ìµ¤¤)"
+
+#: ../src/itdb_itunesdb.c:2009
+#, c-format
msgid "OTG playlist file ('%s'): header length smaller than expected (%d<20)."
-msgstr ""
+msgstr "OTG ¥×¥ì¥¤¥ê¥¹¥È¥Õ¥¡¥¤¥ë ('%s'): ¥Ø¥Ã¥À¤ÎŤµ¤¬Â¤ê¤Þ¤»¤ó¡£(%d<20)"
-#: ../src/itdb_itunesdb.c:1527
+#: ../src/itdb_itunesdb.c:2021
#, c-format
msgid ""
"OTG playlist file file ('%s'): entry length smaller than expected (%d<4)."
-msgstr ""
+msgstr "OTG ¥×¥ì¥¤¥ê¥¹¥È¥Õ¥¡¥¤¥ë ('%s'): ¥¨¥ó¥È¥ê¤ÎŤµ¤¬Â¤ê¤Þ¤»¤ó¡£(%d<4)"
-#: ../src/itdb_itunesdb.c:1562
+#: ../src/itdb_itunesdb.c:2056
#, c-format
msgid "OTG playlist file '%s': reference to non-existent track (%d)."
msgstr ""
+"OTG ¥×¥ì¥¤¥ê¥¹¥È¥Õ¥¡¥¤¥ë ('%s'): ¸ºß¤·¤Ê¤¤¶ÊÈÖ¹æ (%d) ¤Ø¤Î»²¾È¤¬¤¢¤ê¤Þ¤¹¡£"
-#: ../src/itdb_itunesdb.c:1607
+#: ../src/itdb_itunesdb.c:2101
#, c-format
msgid "OTG Playlist %d"
-msgstr ""
+msgstr "OTG ¥×¥ì¥¤¥ê¥¹¥È %d"
-#: ../src/itdb_itunesdb.c:1650
-#, c-format
-msgid "Not a iTunesDB: '%s' (missing mhdb header)."
+#. this should not be -- issue warning
+#: ../src/itdb_itunesdb.c:2169
+msgid ""
+"iTunesDB corrupt: number of tracks (mhit hunks) inconsistent. Trying to "
+"continue.\n"
msgstr ""
+"iTunesDB ¤¬²õ¤ì¤Æ¤¤¤Þ¤¹: ¶Ê¿ô (mhit ¤Î¿ô) ¤¬¿©¤¤°ã¤Ã¤Æ¤¤¤Þ¤¹¡£½èÍý¤ò³¤±¤Þ"
+"¤¹¡£\n"
-#: ../src/itdb_itunesdb.c:1666
-#, c-format
+#. this should not be -- issue warning
+#: ../src/itdb_itunesdb.c:2232
msgid ""
-"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%ld<32). "
-"Aborting."
+"iTunesDB possibly corrupt: number of playlists (mhyp hunks) inconsistent. "
+"Trying to continue.\n"
msgstr ""
+"iTunesDB ¤¬Â¿Ê¬²õ¤ì¤Æ¤¤¤Þ¤¹: ¥×¥ì¥¤¥ê¥¹¥È¤Î¿ô (mhyp ¤Î¿ô) ¤¬¿©¤¤°ã¤Ã¤Æ¤¤¤Þ"
+"¤¹¡£½èÍý¤ò³¤±¤Þ¤¹¡£\n"
-#: ../src/itdb_itunesdb.c:1698
+#: ../src/itdb_itunesdb.c:2279
#, c-format
-msgid "iTunesDB '%s' corrupt: already found two playlist mhsds -- giving up."
-msgstr ""
-
-#. this should not be -- issue warning
-#: ../src/itdb_itunesdb.c:1759
msgid ""
-"iTunesDB possibly corrupt: number of tracks (mhit hunks) inconsistent. "
-"Trying to continue.\n"
+"iTunesDB '%s' corrupt: Could not find tracklist (no mhsd type 1 section "
+"found)"
msgstr ""
+"iTunesDB '%s' ¤¬²õ¤ì¤Æ¤¤¤Þ¤¹: ¶Ê¥ê¥¹¥È¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£(mhsd ¥¿¥¤¥× 1 ¥»¥¯"
+"¥·¥ç¥ó¤¬¸«ÉÕ¤«¤é¤Ê¤¤)"
-#. this should not be -- issue warning
-#: ../src/itdb_itunesdb.c:1841
+#: ../src/itdb_itunesdb.c:2297
+#, c-format
msgid ""
-"iTunesDB possibly corrupt: number of playlists (mhyp hunks) inconsistent. "
-"Trying to continue.\n"
+"iTunesDB '%s' corrupt: Could not find playlists (no mhsd type 2 or type 3 "
+"sections found)"
msgstr ""
+"iTunesDB '%s' ¤¬²õ¤ì¤Æ¤¤¤Þ¤¹: ¥×¥ì¥¤¥ê¥¹¥È¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£(mhsd ¥¿¥¤¥× 2 "
+"¤È ¥¿¥¤¥× 3 ¤Î¥»¥¯¥·¥ç¥ó¤¬¸«ÉÕ¤«¤é¤Ê¤¤)"
-#: ../src/itdb_itunesdb.c:1879
+#: ../src/itdb_itunesdb.c:2356
#, c-format
msgid "File not found: '%s'."
msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: '%s'"
-#: ../src/itdb_itunesdb.c:2396
+#: ../src/itdb_itunesdb.c:2939
#, c-format
msgid "Cannot write mhod of type %d\n"
-msgstr ""
+msgstr "mhod ¥¿¥¤¥× %d ¤¬½ñ¤¹þ¤á¤Þ¤»¤ó¡£\n"
-#: ../src/itdb_itunesdb.c:2522 ../src/itdb_itunesdb.c:2635
-msgid "Database in memory corrupt (track pointer == NULL). Aborting export."
-msgstr ""
-
-#: ../src/itdb_itunesdb.c:2678
-msgid "Database in memory corrupt (playlist pointer == NULL). Aborting export."
-msgstr ""
-
-#: ../src/itdb_itunesdb.c:2718
+#: ../src/itdb_itunesdb.c:3485
#, c-format
msgid "Opening of '%s' for writing failed."
-msgstr "'%s' ¤ò½ñ¤¹þ¤ß¤Î¤¿¤á¤Ë³«¤±¤Þ¤»¤ó¡£"
+msgstr "'%s' ¤ò½ñ¤¹þ¤ßÍѤ˳«¤¯¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£"
-#: ../src/itdb_itunesdb.c:2729
+#: ../src/itdb_itunesdb.c:3496
#, c-format
msgid "Writing to '%s' failed."
msgstr "'%s'¤Î½ñ¤¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
-#: ../src/itdb_itunesdb.c:2740
+#: ../src/itdb_itunesdb.c:3507
#, c-format
msgid "Writing to '%s' failed (%s)."
msgstr "'%s'¤Î½ñ¤¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£(%s)"
-#: ../src/itdb_itunesdb.c:2881 ../src/itdb_itunesdb.c:3052
-#: ../src/itdb_itunesdb.c:3245 ../src/itdb_itunesdb.c:3451
+#: ../src/itdb_itunesdb.c:3679 ../src/itdb_itunesdb.c:3841
+#: ../src/itdb_itunesdb.c:4029 ../src/itdb_itunesdb.c:4265
#, c-format
msgid "Path not found: '%s'."
msgstr "¥Ñ¥¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: '%s'"
-#: ../src/itdb_itunesdb.c:3265
+#: ../src/itdb_itunesdb.c:4050
#, c-format
msgid "Error renaming '%s' to '%s' (%s)."
-msgstr "'%s'¤ò'%s'¤ËÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£(%s)"
+msgstr "'%s' ¤ò '%s' ¤ËÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£(%s)"
-#: ../src/itdb_itunesdb.c:3282
+#: ../src/itdb_itunesdb.c:4067 ../src/itdb_itunesdb.c:4084
#, c-format
msgid "Error removing '%s' (%s)."
-msgstr "'%s'¤Îºï½üÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£(%s)"
+msgstr "'%s' ¤Îºï½üÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£(%s)"
-#: ../src/itdb_itunesdb.c:3426
+#: ../src/itdb_itunesdb.c:4240
#, c-format
msgid "No 'F..' directories found in '%s'."
-msgstr ""
+msgstr "'F..' ¥Ç¥£¥ì¥¯¥È¥ê¤¬ '%s' ¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó¡£"
-#: ../src/itdb_itunesdb.c:3589
+#: ../src/itdb_itunesdb.c:4403
#, c-format
msgid "Error opening '%s' for reading (%s)."
-msgstr "'%s' ¤òÆɤ߹þ¤ß¤Î¤¿¤á¤Ë³«¤¯¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£(%s)"
+msgstr "'%s' ¤òÆɤ߹þ¤ßÍѤ˳«¤¯¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£(%s)"
-#: ../src/itdb_itunesdb.c:3600
+#: ../src/itdb_itunesdb.c:4414
#, c-format
msgid "Error opening '%s' for writing (%s)."
-msgstr "'%s' ¤ò½ñ¤¹þ¤ß¤Î¤¿¤á¤Ë³«¤¯¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£(%s)"
+msgstr "'%s' ¤ò½ñ¤¹þ¤ßÍѤ˳«¤¯¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£(%s)"
-#: ../src/itdb_itunesdb.c:3617
+#: ../src/itdb_itunesdb.c:4431
#, c-format
msgid "Error while reading from '%s' (%s)."
msgstr "'%s' ¤ÎÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£(%s)"
-#: ../src/itdb_itunesdb.c:3633
+#: ../src/itdb_itunesdb.c:4447
#, c-format
msgid "Error while writing to '%s' (%s)."
msgstr "'%s' ¤Î½ñ¤¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£(%s)"
-#: ../src/itdb_itunesdb.c:3646 ../src/itdb_itunesdb.c:3656
+#: ../src/itdb_itunesdb.c:4460 ../src/itdb_itunesdb.c:4470
#, c-format
msgid "Error when closing '%s' (%s)."
msgstr "'%s' ¤òÊĤ¸¤ëºÝ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£(%s)"
@@ -227,4 +293,4 @@
#: ../src/itdb_playlist.c:71
#, c-format
msgid "Unknown action (%d) in smart playlist will be ignored.\n"
-msgstr ""
+msgstr "¥¹¥Þ¡¼¥È¥×¥ì¥¤¥ê¥¹¥ÈÆâ¤Î̤ÃΤΥ¢¥¯¥·¥ç¥ó (%d) ¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£\n"
Modified: libgpod/branches/upstream/current/src/db-artwork-writer.c
===================================================================
--- libgpod/branches/upstream/current/src/db-artwork-writer.c 2006-03-01 00:12:42 UTC (rev 110)
+++ libgpod/branches/upstream/current/src/db-artwork-writer.c 2006-04-08 18:42:34 UTC (rev 111)
@@ -41,7 +41,11 @@
#include <stdio.h>
#include <sys/types.h>
-#define IPOD_MMAP_SIZE 2 * 1024 * 1024
+/* FIXME: Writing aborts if a file exceeds the following size because
+ the mremap() further down will fail (at least most of the time on
+ most systems). As a workaround the size was increased from 2 MB to
+ 16 MB. */
+#define IPOD_MMAP_SIZE 16 * 1024 * 1024
struct iPodMmapBuffer {
int fd;
Modified: libgpod/branches/upstream/current/src/db-itunes-parser.h
===================================================================
--- libgpod/branches/upstream/current/src/db-itunes-parser.h 2006-03-01 00:12:42 UTC (rev 110)
+++ libgpod/branches/upstream/current/src/db-itunes-parser.h 2006-04-08 18:42:34 UTC (rev 111)
@@ -523,8 +523,13 @@
gint32 unknown8;
gint32 orig_img_size;
unsigned char padding[];
-};
+} __attribute__((__packed__));
+/* I we don't put the 'packed' attribute above, some 64 bit systems
+ * will pad the 64 bit integer to be aligned to an 8-byte boundary.
+ * Hopefully there won't be any systems around that crash when
+ * accessing 64 bit integers not aligned to 8-byte boundaries. */
+
struct _MhniHeader {
unsigned char header_id[4];
gint32 header_len;
Modified: libgpod/branches/upstream/current/src/ipod-device.c
===================================================================
--- libgpod/branches/upstream/current/src/ipod-device.c 2006-03-01 00:12:42 UTC (rev 110)
+++ libgpod/branches/upstream/current/src/ipod-device.c 2006-04-08 18:42:34 UTC (rev 111)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-10-10 01:23:29 jcs>
+/* Time-stamp: <2006-02-28 20:04:37 jcs>
|
| Copyright (C) 2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -28,7 +28,7 @@
|
|
|
-| $Id: ipod-device.c,v 1.11 2005/11/22 12:27:17 teuf Exp $
+| $Id: ipod-device.c,v 1.17 2006/02/28 11:06:09 jcsjcs Exp $
*/
/* ex: set ts=4: */
/***************************************************************************
@@ -169,6 +169,7 @@
/* HP iPods, need contributions for this table */
{"E436", 40 * GB, MODEL_TYPE_REGULAR, FOURTH_GENERATION},
+ {"S492", 30 * GB, MODEL_TYPE_COLOR, FOURTH_GENERATION},
{NULL, 0, 0, 0}
};
@@ -529,37 +530,43 @@
gchar **volumes;
gint volume_count;
+ g_return_if_fail (device);
+
switch(prop_id) {
case PROP_MOUNT_POINT:
case PROP_DEVICE_PATH:
case PROP_HAL_VOLUME_ID:
- str = g_value_get_string(value);
- volumes = libhal_manager_find_device_string_match(
- device->priv->hal_context, "block.device", str,
+ str = g_value_get_string(value);
+ volumes = NULL;
+ if (device->priv->hal_context)
+ {
+ volumes = libhal_manager_find_device_string_match(
+ device->priv->hal_context, "block.device", str,
&volume_count, NULL);
-
- if(volume_count == 0) {
+ if(volume_count == 0)
+ {
libhal_free_string_array(volumes);
volumes = libhal_manager_find_device_string_match(
- device->priv->hal_context, "volume.mount_point",
- str, &volume_count, NULL);
-
- if(volume_count >= 1)
- str = volumes[0];
- } else {
+ device->priv->hal_context, "volume.mount_point",
+ str, &volume_count, NULL);
+ }
+ if(volume_count >= 1)
+ {
str = volumes[0];
+ }
}
#ifdef HAVE_LIBHAL
g_free_if_not_null(device->priv->hal_volume_id);
- device->priv->hal_volume_id = g_strdup(str);
+ device->priv->hal_volume_id = g_strdup (str);
#else
/* JCS for libgpod */
g_free (device->priv->mount_point);
device->priv->mount_point = g_strdup (str);
/* end JCS for libgpod */
#endif
+ if (volumes)
+ libhal_free_string_array(volumes);
device->priv->is_ipod = ipod_device_reload(device);
- libhal_free_string_array(volumes);
break;
case PROP_DEVICE_NAME:
str = g_value_get_string(value);
@@ -864,6 +871,7 @@
libhal_ctx_set_dbus_connection(hal_context, dbus_connection);
if(!libhal_ctx_init(hal_context, &error)) {
+ dbus_error_free(&error);
libhal_ctx_free(hal_context);
return NULL;
}
@@ -933,13 +941,15 @@
gunichar2 *utf16;
gchar *utf8;
- fread(&length, 1, sizeof(gshort), fd);
+ if (fread(&length, sizeof(gshort), 1, fd) != 1)
+ return NULL;
if(length <= 0)
return NULL;
utf16 = (gunichar2 *)g_malloc(length * sizeof(gunichar2));
- fread(utf16, sizeof(gunichar2), length, fd);
+ if (fread(utf16, sizeof(gunichar2), length, fd) != length)
+ return NULL;
if(utf16 == NULL)
return NULL;
@@ -957,6 +967,7 @@
{
gunichar2 *unistr;
gshort length;
+ size_t res;
if(str == NULL)
return;
@@ -966,8 +977,9 @@
length = length > 0x198 ? 0x198 : length;
- fwrite(&length, 2, 1, fd);
- fwrite(unistr, 2, length, fd);
+ /* FIXME: we do not check if the write was successful */
+ res = fwrite(&length, 2, 1, fd);
+ res = fwrite(unistr, 2, length, fd);
g_free(unistr);
}
@@ -1029,6 +1041,7 @@
{
gchar *path;
FILE *fd;
+ gint intres;
g_return_val_if_fail(IS_IPOD_DEVICE(device), FALSE);
@@ -1045,10 +1058,10 @@
if(device->priv->device_name == NULL)
device->priv->device_name = g_strdup("iPod");
- fseek(fd, 0x200, SEEK_SET);
+ intres=fseek(fd, 0x200, SEEK_SET);
device->priv->user_name = ipod_device_read_device_info_string(fd);
- fseek(fd, 0x400, SEEK_SET);
+ intres=fseek(fd, 0x400, SEEK_SET);
device->priv->host_name = ipod_device_read_device_info_string(fd);
fclose(fd);
@@ -1116,7 +1129,7 @@
gchar *p = model_num;
if(isalpha(model_num[0]))
- *p++;
+ p++;
for(i = 2; ipod_model_table[i].model_number != NULL; i++) {
if(g_strncasecmp(p, ipod_model_table[i].model_number, 4) == 0) {
@@ -1682,6 +1695,8 @@
gchar *path, *itunes_dir;
gchar bs = 0;
GError *error = NULL;
+ size_t res;
+ gint intres;
g_return_val_if_fail(IS_IPOD_DEVICE(device), FALSE);
@@ -1723,11 +1738,12 @@
fseek(fd, 0x200, SEEK_SET);
ipod_device_write_device_info_string(device->priv->user_name, fd);
- fseek(fd, 0x400, SEEK_SET);
+ intres = fseek(fd, 0x400, SEEK_SET);
ipod_device_write_device_info_string(device->priv->host_name, fd);
- fseek(fd, 0X5FF, SEEK_SET);
- fwrite(&bs, 1, 1, fd);
+ intres = fseek(fd, 0X5FF, SEEK_SET);
+ /* FIXME: we do not check if the write was successful */
+ res = fwrite(&bs, 1, 1, fd);
fclose(fd);
Modified: libgpod/branches/upstream/current/src/itdb_itunesdb.c
===================================================================
--- libgpod/branches/upstream/current/src/itdb_itunesdb.c 2006-03-01 00:12:42 UTC (rev 110)
+++ libgpod/branches/upstream/current/src/itdb_itunesdb.c 2006-04-08 18:42:34 UTC (rev 111)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-11 16:27:34 jcs>
+/* Time-stamp: <2006-02-14 22:10:45 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -30,7 +30,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: itdb_itunesdb.c,v 1.39 2005/12/11 07:41:42 jcsjcs Exp $
+| $Id: itdb_itunesdb.c,v 1.42 2006/02/14 13:28:06 jcsjcs Exp $
*/
/* Some notes on how to use the functions in this file:
@@ -701,7 +701,7 @@
struct playcount *playcount = g_new0 (struct playcount, 1);
guint32 entry_length = get24lint (cts, seek+0);
CHECK_ERROR (fimp, FALSE);
- if (entry_length < 0x18)
+ if (entry_length < 18)
{
g_set_error (&fimp->error,
ITDB_FILE_ERROR,
@@ -1395,17 +1395,19 @@
+gint pos_comp (gpointer a, gpointer b);
+gint pos_comp (gpointer a, gpointer b)
+{
+ return (GPOINTER_TO_UINT(a) - GPOINTER_TO_UINT(b));
+}
+
+
/* Read and process the mhip at @seek. Return a pointer to the next
possible mhip. */
/* Return value: -1 if no mhip is present at @seek */
static glong get_mhip (FImport *fimp, Itdb_Playlist *plitem,
glong mhip_seek)
{
- auto gint pos_comp (gpointer a, gpointer b);
- gint pos_comp (gpointer a, gpointer b)
- {
- return (GPOINTER_TO_UINT(a) - GPOINTER_TO_UINT(b));
- }
gboolean first_entry = TRUE;
FContents *cts;
guint32 mhip_hlen, mhip_len, mhod_num, mhod_seek;
@@ -3229,74 +3231,76 @@
}
-/* write out the mhip/mhod pairs for the podcast playlist
- @pl. @mhyp_seek points to the start of the corresponding mhyp, but
- is not used yet. */
-static gboolean write_podcast_mhips (FExport *fexp,
- Itdb_Playlist *pl,
- glong mhyp_seek)
+void free_memberlist (gpointer data);
+void write_one_podcast_group (gpointer key, gpointer value, gpointer userdata);
+void free_memberlist (gpointer data)
{
- auto void free_memberlist (gpointer data);
- auto void write_one_podcast_group (gpointer key, gpointer value,
- gpointer userdata);
- void free_memberlist (gpointer data)
- {
- GList **memberlist = data;
- if (memberlist)
- {
- g_list_free (*memberlist);
- g_free (memberlist);
- }
- }
- auto void write_one_podcast_group (gpointer key, gpointer value,
- gpointer userdata)
- {
- gchar *album = key;
- GList **memberlist = value;
- FExport *fexp = userdata;
- GList *gl;
- WContents *cts;
- glong mhip_seek;
- guint32 groupid;
- Itdb_iTunesDB *itdb;
- MHODData mhod;
+ GList **memberlist = data;
+ if (memberlist)
+ {
+ g_list_free (*memberlist);
+ g_free (memberlist);
+ }
+}
+void write_one_podcast_group (gpointer key, gpointer value,
+ gpointer userdata)
+{
+ gchar *album = key;
+ GList **memberlist = value;
+ FExport *fexp = userdata;
+ GList *gl;
+ WContents *cts;
+ glong mhip_seek;
+ guint32 groupid;
+ Itdb_iTunesDB *itdb;
+ MHODData mhod;
- g_return_if_fail (album);
- g_return_if_fail (memberlist);
- g_return_if_fail (fexp);
- g_return_if_fail (fexp->itdb);
- g_return_if_fail (fexp->itunesdb);
+ g_return_if_fail (album);
+ g_return_if_fail (memberlist);
+ g_return_if_fail (fexp);
+ g_return_if_fail (fexp->itdb);
+ g_return_if_fail (fexp->itunesdb);
- cts = fexp->itunesdb;
- itdb = fexp->itdb;
- mhip_seek = cts->pos;
+ cts = fexp->itunesdb;
+ itdb = fexp->itdb;
+ mhip_seek = cts->pos;
- groupid = fexp->next_id++;
- mk_mhip (fexp, 1, 256, groupid, 0, 0, 0);
+ groupid = fexp->next_id++;
+ mk_mhip (fexp, 1, 256, groupid, 0, 0, 0);
- mhod.valid = TRUE;
- mhod.type = MHOD_ID_TITLE;
- mhod.data.string = album;
- mk_mhod (cts, &mhod);
- fix_header (cts, mhip_seek);
+ mhod.valid = TRUE;
+ mhod.type = MHOD_ID_TITLE;
+ mhod.data.string = album;
+ mk_mhod (cts, &mhod);
+ fix_header (cts, mhip_seek);
- /* write members */
- for (gl=*memberlist; gl; gl=gl->next)
- {
- Itdb_Track *track = gl->data;
- guint32 mhip_id;
+ /* write members */
+ for (gl=*memberlist; gl; gl=gl->next)
+ {
+ Itdb_Track *track = gl->data;
+ guint32 mhip_id;
- g_return_if_fail (track);
+ g_return_if_fail (track);
- mhip_seek = cts->pos;
- mhip_id = fexp->next_id++;
- mk_mhip (fexp, 1, 0, mhip_id, track->id, 0, groupid);
- mhod.type = MHOD_ID_PLAYLIST;
- mhod.data.track_pos = mhip_id;
- mk_mhod (cts, &mhod);
- fix_header (cts, mhip_seek);
- }
- }
+ mhip_seek = cts->pos;
+ mhip_id = fexp->next_id++;
+ mk_mhip (fexp, 1, 0, mhip_id, track->id, 0, groupid);
+ mhod.type = MHOD_ID_PLAYLIST;
+ mhod.data.track_pos = mhip_id;
+ mk_mhod (cts, &mhod);
+ fix_header (cts, mhip_seek);
+ }
+}
+
+
+
+/* write out the mhip/mhod pairs for the podcast playlist
+ @pl. @mhyp_seek points to the start of the corresponding mhyp, but
+ is not used yet. */
+static gboolean write_podcast_mhips (FExport *fexp,
+ Itdb_Playlist *pl,
+ glong mhyp_seek)
+{
GList *gl;
WContents *cts;
guint32 mhip_num;
Modified: libgpod/branches/upstream/current/src/itdb_playlist.c
===================================================================
--- libgpod/branches/upstream/current/src/itdb_playlist.c 2006-03-01 00:12:42 UTC (rev 110)
+++ libgpod/branches/upstream/current/src/itdb_playlist.c 2006-04-08 18:42:34 UTC (rev 111)
@@ -24,7 +24,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: itdb_playlist.c,v 1.14 2005/11/19 07:30:18 jcsjcs Exp $
+| $Id: itdb_playlist.c,v 1.15 2006/02/03 18:44:48 jcsjcs Exp $
*/
#include "itdb_private.h"
@@ -782,38 +782,38 @@
}
+void spl_update (Itdb_Playlist *playlist, gpointer data);
+void spl_update (Itdb_Playlist *playlist, gpointer data)
+{
+ g_return_if_fail (playlist);
+ itdb_spl_update (playlist);
+}
/* update all smart playlists */
void itdb_spl_update_all (Itdb_iTunesDB *itdb)
{
- auto void spl_update (Itdb_Playlist *playlist, gpointer data);
- void spl_update (Itdb_Playlist *playlist, gpointer data)
- {
- g_return_if_fail (playlist);
- itdb_spl_update (playlist);
- }
-
g_return_if_fail (itdb);
g_list_foreach (itdb->playlists, (GFunc)spl_update, NULL);
}
+void spl_update2 (Itdb_Playlist *playlist, gpointer data);
+void spl_update2 (Itdb_Playlist *playlist, gpointer data)
+{
+ g_return_if_fail (playlist);
+ if (playlist->is_spl && playlist->splpref.liveupdate)
+ itdb_spl_update (playlist);
+}
+
+
/* update all smart playlists with 'live updating' set*/
void itdb_spl_update_live (Itdb_iTunesDB *itdb)
{
- auto void spl_update (Itdb_Playlist *playlist, gpointer data);
- void spl_update (Itdb_Playlist *playlist, gpointer data)
- {
- g_return_if_fail (playlist);
- if (playlist->is_spl && playlist->splpref.liveupdate)
- itdb_spl_update (playlist);
- }
-
g_return_if_fail (itdb);
- g_list_foreach (itdb->playlists, (GFunc)spl_update, NULL);
+ g_list_foreach (itdb->playlists, (GFunc)spl_update2, NULL);
}
Modified: libgpod/branches/upstream/current/src/ithumb-writer.c
===================================================================
--- libgpod/branches/upstream/current/src/ithumb-writer.c 2006-03-01 00:12:42 UTC (rev 110)
+++ libgpod/branches/upstream/current/src/ithumb-writer.c 2006-04-08 18:42:34 UTC (rev 111)
@@ -291,16 +291,16 @@
}
+gint offset_sort (gconstpointer a, gconstpointer b);
+gint offset_sort (gconstpointer a, gconstpointer b)
+{
+ return (-(((Itdb_Thumb *)a)->offset - ((Itdb_Thumb *)b)->offset));
+}
+
static gboolean ithumb_rearrange_thumbnail_file (gpointer _key,
gpointer _thumbs,
gpointer _user_data)
{
- auto gint offset_sort (gconstpointer a, gconstpointer b);
- gint offset_sort (gconstpointer a, gconstpointer b)
- {
- return (-(((Itdb_Thumb *)a)->offset -
- ((Itdb_Thumb *)b)->offset));
- }
const gchar *filename = _key;
GList *thumbs = _thumbs;
gboolean *result = _user_data;
More information about the Pkg-gtkpod-devel
mailing list