diff options
| author | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2006-06-01 15:45:28 +0000 |
|---|---|---|
| committer | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2006-06-01 15:45:28 +0000 |
| commit | 080dfe6ea289c9f8809a156699fc30ec00700edf (patch) | |
| tree | 357ea03987d9101f0cadb57d1906d4bebae99d36 /src/itdb_endianness.h | |
| parent | 1caaeade460f1e6e3226c8f0606be2f1f3b9b102 (diff) | |
| download | libgpod-tmz-080dfe6ea289c9f8809a156699fc30ec00700edf.tar.gz libgpod-tmz-080dfe6ea289c9f8809a156699fc30ec00700edf.tar.xz libgpod-tmz-080dfe6ea289c9f8809a156699fc30ec00700edf.zip | |
* src/itdb.h:
src/itdb_private.h:
moved Itdb_DB to private part.
* src/itdb.h:
src/itdb_private.h:
src/itdb_itunesdb:
New: db_get_itunesdb(), db_get_photodb()
* src/db-artwork-parser.c
src/db-artwork-writer.c
src/db-image-parser.c
src/db-image-parser.h
src/db-parse-context.c
src/db-parse-context.h
src/itdb_endianness.h
src/itdb_itunesdb.c
src/ithumb-writer.c:
Remove all direct access to Itdb_DB->db. enum
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1296 f01d2545-417e-4e96-918e-98f8d0dbbcb6
Diffstat (limited to 'src/itdb_endianness.h')
| -rw-r--r-- | src/itdb_endianness.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/itdb_endianness.h b/src/itdb_endianness.h index 3eb129c..4147dd0 100644 --- a/src/itdb_endianness.h +++ b/src/itdb_endianness.h @@ -27,6 +27,7 @@ #include <glib.h> #include "itdb.h" #include "itdb_device.h" +#include "itdb_private.h" #define DB_TO_CPU_GET(lower_case_type, upper_case_type) \ static inline lower_case_type \ @@ -57,20 +58,12 @@ static inline lower_case_type \ get_##lower_case_type##_db (Itdb_DB *db, lower_case_type val) \ { \ - switch (db->db_type) { \ - case DB_TYPE_ITUNES: \ - g_assert (db->db.itdb->device != NULL); \ - return get_##lower_case_type (val, db->db.itdb->device->byte_order); \ - case DB_TYPE_PHOTO: \ - g_assert (db->db.photodb->device != NULL); \ - return get_##lower_case_type (val, db->db.photodb->device->byte_order); \ - } \ - return 0; \ -} + g_assert (db_get_device(db) != NULL); \ + return get_##lower_case_type (val, db_get_device(db)->byte_order); \ + } DB_TO_CPU_GET_DB(guint32, GUINT32) DB_TO_CPU_GET_DB(gint32, GINT32) DB_TO_CPU_GET_DB(gint16, GINT16) DB_TO_CPU_GET_DB(gint64, GINT64) - /*DB_TO_CPU_GET(gint, GINT)*/ #endif |