Menu
▾
▴
[Pmplib-commits] SF.net SVN: pmplib: [249] trunk/pmplib
|
From: <ny...@us...> - 2007-01-07 18:20:09
|
Revision: 249
http://svn.sourceforge.net/pmplib/?rev=249&view=rev
Author: nyaochi
Date: 2007-01-07 10:19:50 -0800 (Sun, 07 Jan 2007)
Log Message:
-----------
Rename pmp_record_t to pmp_music_record_t
Modified Paths:
--------------
trunk/pmplib/frontend/easypmp/common/database.c
trunk/pmplib/frontend/easypmp/common/easypmp.h
trunk/pmplib/frontend/easypmp/common/playlist.c
trunk/pmplib/frontend/easypmp/cui/main.c
trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h
trunk/pmplib/include/gmi.h
trunk/pmplib/include/playlist.h
trunk/pmplib/include/pmp.h
trunk/pmplib/lib/playlist/jspl.c
trunk/pmplib/lib/playlist/playlist.c
trunk/pmplib/lib/pmp/pmp.c
trunk/pmplib/lib/pmp_iriverplus2/ip2db.c
trunk/pmplib/lib/pmp_iriverplus2/ip2db.h
trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c
trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c
trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c
trunk/pmplib/lib/pmp_portalplayer1/model_iriver_h10.c
trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke220.c
trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke440.c
trunk/pmplib/lib/pmp_portalplayer1/model_philips_hdd6320.c
trunk/pmplib/lib/pmp_portalplayer1/model_samsung.c
trunk/pmplib/lib/pmp_portalplayer1/model_sirius_s50.c
trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c
trunk/pmplib/lib/pmp_portalplayer1/pp1db.c
trunk/pmplib/lib/pmp_portalplayer1/pp1db.h
Modified: trunk/pmplib/frontend/easypmp/common/database.c
===================================================================
--- trunk/pmplib/frontend/easypmp/common/database.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/frontend/easypmp/common/database.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -57,13 +57,13 @@
static int comp_filename(const void *_x, const void *_y)
{
- const pmp_record_t *x = (const pmp_record_t*)_x;
- const pmp_record_t *y = (const pmp_record_t*)_y;
+ const pmp_music_record_t *x = (const pmp_music_record_t*)_x;
+ const pmp_music_record_t *y = (const pmp_music_record_t*)_y;
return COMP_STR(x->filename, y->filename);
}
static int find_mediafile(
- pmp_record_t* records,
+ pmp_music_record_t* records,
int num_records,
const ucs2char_t* filename,
int *begin,
@@ -102,7 +102,7 @@
const easypmp_filelist_t* fl,
pmp_t* pmp,
const option_t* opt,
- pmp_record_t** ptr_records,
+ pmp_music_record_t** ptr_records,
uint32_t* ptr_num_records,
easypmp_progress_t progress,
void *instance
@@ -112,8 +112,8 @@
uint32_t i;
result_t res = 0;
pmp_music_t* pmpdb = pmp->music;
- pmp_record_t* records = NULL;
- pmp_record_t* old_records = NULL;
+ pmp_music_record_t* records = NULL;
+ pmp_music_record_t* old_records = NULL;
uint32_t num_old_records = 0, num_obtained = 0;
uint32_t ts_import = get_current_time();
@@ -142,7 +142,7 @@
}
// Allocate an array for the records.
- old_records = malloc(sizeof(pmp_record_t) * num_old_records);
+ old_records = malloc(sizeof(pmp_music_record_t) * num_old_records);
if (!old_records) {
result = EASYPMPE_INSUFFICIENT_MEMORY;
goto error_exit;
@@ -156,7 +156,7 @@
}
// Sort the records for binary search.
- qsort(old_records, num_old_records, sizeof(pmp_record_t), comp_filename);
+ qsort(old_records, num_old_records, sizeof(pmp_music_record_t), comp_filename);
} else {
if (progress(instance, EASYPMPDBP_READ | EASYPMPSP_SKIPPED, 0, 0, NULL) != 0) {
result = EASYPMPE_CANCEL;
@@ -167,7 +167,7 @@
/*
* Allocate an array for the new records.
*/
- records = calloc(fl->num_elements, sizeof(pmp_record_t));
+ records = calloc(fl->num_elements, sizeof(pmp_music_record_t));
if (!records) {
result = EASYPMPE_INSUFFICIENT_MEMORY;
goto error_exit;
@@ -184,7 +184,7 @@
for (i = 0;i < fl->num_elements;++i) {
int is_skipping = 0;
easypmp_filename_t* target = &fl->elements[i];
- pmp_record_t* record = &records[i];
+ pmp_music_record_t* record = &records[i];
ucs2char_t filename[MAX_PATH];
uint32_t timestamp = 0;
Modified: trunk/pmplib/frontend/easypmp/common/easypmp.h
===================================================================
--- trunk/pmplib/frontend/easypmp/common/easypmp.h 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/frontend/easypmp/common/easypmp.h 2007-01-07 18:19:50 UTC (rev 249)
@@ -144,7 +144,7 @@
const easypmp_filelist_t* fl,
pmp_t* pmp,
const option_t* opt,
- pmp_record_t** ptr_records,
+ pmp_music_record_t** ptr_records,
uint32_t* ptr_num_records,
easypmp_progress_t progress,
void *instance
@@ -162,7 +162,7 @@
const easypmp_filelist_t* musics,
pmp_t* pmp,
const option_t* opt,
- pmp_record_t* records,
+ pmp_music_record_t* records,
uint32_t num_records,
easypmp_progress_t progress,
void *instance
Modified: trunk/pmplib/frontend/easypmp/common/playlist.c
===================================================================
--- trunk/pmplib/frontend/easypmp/common/playlist.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/frontend/easypmp/common/playlist.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -68,7 +68,7 @@
const easypmp_filelist_t* musics,
pmp_t* pmp,
const option_t* opt,
- pmp_record_t* records,
+ pmp_music_record_t* records,
uint32_t num_records,
easypmp_progress_t progress,
void *instance
Modified: trunk/pmplib/frontend/easypmp/cui/main.c
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/main.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/frontend/easypmp/cui/main.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -210,7 +210,7 @@
pmphelp_t* pmphelp = NULL;
pmp_t* pmp = NULL;
easypmp_filelist_t musics, playlists;
- pmp_record_t* records = NULL;
+ pmp_music_record_t* records = NULL;
uint32_t num_records = 0;
uint32_t openflag = 0;
FILE *fpi = stdin, *fpo = stdout, *fpe = stderr;
Modified: trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h
===================================================================
--- trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h 2007-01-07 18:19:50 UTC (rev 249)
@@ -240,7 +240,7 @@
CString str;
USES_CONVERSION;
int result = 0;
- pmp_record_t* records = NULL;
+ pmp_music_record_t* records = NULL;
uint32_t num_records = 0;
static int media_info_sources[] = {
GMIF_TAG,
Modified: trunk/pmplib/include/gmi.h
===================================================================
--- trunk/pmplib/include/gmi.h 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/include/gmi.h 2007-01-07 18:19:50 UTC (rev 249)
@@ -54,7 +54,7 @@
GMIF_PARSEMASK = 0x00FF0000,
};
-#define media_info_t pmp_record_t
+#define media_info_t pmp_music_record_t
#define gmi_finish pmp_record_finish
GMIAPI int gmi_get(
Modified: trunk/pmplib/include/playlist.h
===================================================================
--- trunk/pmplib/include/playlist.h 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/include/playlist.h 2007-01-07 18:19:50 UTC (rev 249)
@@ -110,7 +110,7 @@
playlists_t* pls,
const ucs2char_t* filename,
const ucs2char_t* path_to_include,
- pmp_record_t* records,
+ pmp_music_record_t* records,
int num_records,
playlist_callback_t callback,
void *instance
Modified: trunk/pmplib/include/pmp.h
===================================================================
--- trunk/pmplib/include/pmp.h 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/include/pmp.h 2007-01-07 18:19:50 UTC (rev 249)
@@ -106,10 +106,28 @@
ucs2char_t playlist_ext[MAX_PATH];
} pmp_environment_t;
+struct tag_pmp_t {
+ uint32_t ref_count;
+ void* instance;
+ pmp_environment_t env;
+ pmp_music_t* music;
+ uint32_t flag;
+
+ uint32_t (*add_ref)(pmp_t* pmp);
+ uint32_t (*release)(pmp_t* pmp);
+
+ result_t (*open)(pmp_t* pmp, uint32_t flag);
+ result_t (*close)(pmp_t* pmp, uint32_t flag);
+
+ result_t (*create_instance_pl)(pmp_t* pmp, pmp_playlist_t** pmppl);
+};
+
+typedef void pmpdb_readwrite_progress_t(void *instance, uint32_t size, uint32_t total);
+
/**
* Structure of media record.
*/
-struct tag_pmp_record_t {
+struct tag_pmp_music_record_t {
ucs2char_t *filename; /**< Filename. */
ucs2char_t *title; /**< Track title. */
ucs2char_t *artist; /**< Artist name. */
@@ -129,32 +147,14 @@
uint32_t ts_playback; /**< Date/time of recent playback of the track. */
uint32_t ts_import; /**< Date/time when the track was imported. */
};
-typedef struct tag_pmp_record_t pmp_record_t;
+typedef struct tag_pmp_music_record_t pmp_music_record_t;
-struct tag_pmp_t {
- uint32_t ref_count;
- void* instance;
- pmp_environment_t env;
- pmp_music_t* music;
- uint32_t flag;
-
- uint32_t (*add_ref)(pmp_t* pmp);
- uint32_t (*release)(pmp_t* pmp);
-
- result_t (*open)(pmp_t* pmp, uint32_t flag);
- result_t (*close)(pmp_t* pmp, uint32_t flag);
-
- result_t (*create_instance_pl)(pmp_t* pmp, pmp_playlist_t** pmppl);
-};
-
-typedef void pmpdb_readwrite_progress_t(void *instance, uint32_t size, uint32_t total);
-
struct tag_pmp_music_t {
void* instance;
pmp_t* pmp;
- result_t (*set)(pmp_music_t* pmpdb, const pmp_record_t* records, uint32_t num_records);
- result_t (*get)(pmp_music_t* pmpdb, pmp_record_t* records, uint32_t* num_records);
+ result_t (*set)(pmp_music_t* pmpdb, const pmp_music_record_t* records, uint32_t num_records);
+ result_t (*get)(pmp_music_t* pmpdb, pmp_music_record_t* records, uint32_t* num_records);
result_t (*dump)(pmp_music_t* pmpdb, FILE *fp, int level);
@@ -177,9 +177,9 @@
typedef void (*pmp_enumerate_devid_callback_t)(void *instance, const char *devid);
typedef result_t (*pmp_enumerate_devid_t)(pmp_enumerate_devid_callback_t callback, void *instance);
-PMPAPI void pmp_record_init(pmp_record_t* record);
-PMPAPI void pmp_record_finish(pmp_record_t* record);
-PMPAPI result_t pmp_record_copy(pmp_record_t* dst, const pmp_record_t* src);
+PMPAPI void pmp_record_init(pmp_music_record_t* record);
+PMPAPI void pmp_record_finish(pmp_music_record_t* record);
+PMPAPI result_t pmp_record_copy(pmp_music_record_t* dst, const pmp_music_record_t* src);
#ifdef __cplusplus
Modified: trunk/pmplib/lib/playlist/jspl.c
===================================================================
--- trunk/pmplib/lib/playlist/jspl.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/playlist/jspl.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -306,7 +306,7 @@
return 0;
}
-static int jspl_set(jspl_t* jspl, const pmp_record_t* records, int num_records)
+static int jspl_set(jspl_t* jspl, const pmp_music_record_t* records, int num_records)
{
int i;
@@ -330,7 +330,7 @@
jspl->records = (JSObject**)calloc(num_records, sizeof(JSObject*));
for (i = 0;i < num_records;++i) {
- const pmp_record_t* record = &records[i];
+ const pmp_music_record_t* record = &records[i];
JSObject* obj = NULL;
jsval jsval_obj;
@@ -550,7 +550,7 @@
playlists_t* pls,
const ucs2char_t *filename,
const ucs2char_t *path_to_include,
- pmp_record_t* records,
+ pmp_music_record_t* records,
int num_records,
playlist_callback_t callback,
void *instance
Modified: trunk/pmplib/lib/playlist/playlist.c
===================================================================
--- trunk/pmplib/lib/playlist/playlist.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/playlist/playlist.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -53,7 +53,7 @@
playlists_t* pls,
const ucs2char_t *filename,
const ucs2char_t *path_to_include,
- pmp_record_t* records,
+ pmp_music_record_t* records,
int num_records,
playlist_callback_t callback,
void *instance
@@ -78,7 +78,7 @@
playlists_t* pls,
const ucs2char_t* filename,
const ucs2char_t* path_to_include,
- pmp_record_t* records,
+ pmp_music_record_t* records,
int num_records,
playlist_callback_t callback,
void *instance
Modified: trunk/pmplib/lib/pmp/pmp.c
===================================================================
--- trunk/pmplib/lib/pmp/pmp.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp/pmp.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -34,13 +34,13 @@
#include <ucs2char.h>
#include <pmp.h>
-void pmp_record_init(pmp_record_t* record)
+void pmp_record_init(pmp_music_record_t* record)
{
memset(record, 0, sizeof(*record));
}
-void pmp_record_finish(pmp_record_t* record)
+void pmp_record_finish(pmp_music_record_t* record)
{
ucs2free(record->filename);
ucs2free(record->title);
@@ -51,7 +51,7 @@
pmp_record_init(record);
}
-result_t pmp_record_copy(pmp_record_t* dst, const pmp_record_t* src)
+result_t pmp_record_copy(pmp_music_record_t* dst, const pmp_music_record_t* src)
{
memcpy(dst, src, sizeof(*src));
dst->filename = src->filename ? ucs2dup(src->filename) : NULL;
Modified: trunk/pmplib/lib/pmp_iriverplus2/ip2db.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/ip2db.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_iriverplus2/ip2db.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -158,7 +158,7 @@
}
-result_t ip2db_set(ip2db_t* db, const pmp_record_t* records, uint32_t num_records, const ucs2char_t* path_to_root)
+result_t ip2db_set(ip2db_t* db, const pmp_music_record_t* records, uint32_t num_records, const ucs2char_t* path_to_root)
{
result_t ret = 0;
uint32_t i, j, n = 0;
@@ -178,9 +178,9 @@
return PMPDBE_OUTOFMEMORY;
}
- // Convert records from pmp_record_t to ip2db_record_t.
+ // Convert records from pmp_music_record_t to ip2db_record_t.
for (i = 0, j = 0;i < num_records;++i) {
- const pmp_record_t* src = &records[i];
+ const pmp_music_record_t* src = &records[i];
ip2db_record_t* dst = &ip2db_records[j];
if (!ip2db_is_supported_codec(src->codec)) {
@@ -244,7 +244,7 @@
return ret;
}
-result_t ip2db_get(ip2db_t* db, pmp_record_t* records, uint32_t* num_records, const ucs2char_t* path_to_root)
+result_t ip2db_get(ip2db_t* db, pmp_music_record_t* records, uint32_t* num_records, const ucs2char_t* path_to_root)
{
uint32_t i = 0, j = 0, n = ip2db_get_num_record(db);
@@ -262,7 +262,7 @@
size_t length = 0;
ucs2char_t tmp[128];
ip2db_record_t src;
- pmp_record_t* dst = &records[j];
+ pmp_music_record_t* dst = &records[j];
pmp_record_init(dst);
Modified: trunk/pmplib/lib/pmp_iriverplus2/ip2db.h
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/ip2db.h 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_iriverplus2/ip2db.h 2007-01-07 18:19:50 UTC (rev 249)
@@ -252,8 +252,8 @@
result_t ip2db_write(ip2db_t* db, const ucs2char_t* dat_filename, const ucs2char_t* idx_filename);
int ip2db_is_supported_codec(uint32_t codec);
int ip2db_is_supported_ext(const ucs2char_t* filename);
-result_t ip2db_set(ip2db_t* db, const pmp_record_t* records, uint32_t num_records, const ucs2char_t* path_to_root);
-result_t ip2db_get(ip2db_t* db, pmp_record_t* records, uint32_t* num_records, const ucs2char_t* path_to_root);
+result_t ip2db_set(ip2db_t* db, const pmp_music_record_t* records, uint32_t num_records, const ucs2char_t* path_to_root);
+result_t ip2db_get(ip2db_t* db, pmp_music_record_t* records, uint32_t* num_records, const ucs2char_t* path_to_root);
uint32_t ip2db_get_num_record(ip2db_t* db);
void ip2db_set_num_record(ip2db_t* db, uint32_t value);
uint32_t ip2db_get_num_pages(ip2db_t* db);
Modified: trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -123,8 +123,8 @@
static uint32_t pmpdb_release(pmp_music_t* pmpdb);
static result_t pmpdb_read(pmp_music_t* pmpdb);
static result_t pmpdb_write(pmp_music_t* pmpdb);
-static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_record_t* records, uint32_t num_records);
-static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_record_t* records, uint32_t* num_records);
+static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_music_record_t* records, uint32_t num_records);
+static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_music_record_t* records, uint32_t* num_records);
static result_t pmpdb_dump(pmp_music_t* pmpdb, FILE *fp, int level);
static int pmpdb_is_supported_codec(pmp_music_t* pmpdb, uint32_t codec);
static int pmpdb_is_supported_ext(pmp_music_t* pmpdb, const ucs2char_t* filename);
@@ -508,14 +508,14 @@
return ip2db_write(&pmpdbi->ip2db, pmpi->env.dat_filename, pmpi->env.idx_filename);
}
-static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_record_t* records, uint32_t num_records)
+static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_music_record_t* records, uint32_t num_records)
{
pmpdb_internal_t* pmpdbi = (pmpdb_internal_t*)pmpdb->instance;
pmp_internal_t* pmpi = (pmp_internal_t*)pmpdb->pmp->instance;
return ip2db_set(&pmpdbi->ip2db, records, num_records, pmpi->env.path_to_root);
}
-static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_record_t* records, uint32_t* num_records)
+static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_music_record_t* records, uint32_t* num_records)
{
pmpdb_internal_t* pmpdbi = (pmpdb_internal_t*)pmpdb->instance;
pmp_internal_t* pmpi = (pmp_internal_t*)pmpdb->pmp->instance;
Modified: trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -119,8 +119,8 @@
static uint32_t pmpdb_release(pmp_music_t* pmpdb);
static result_t pmpdb_read(pmp_music_t* pmpdb);
static result_t pmpdb_write(pmp_music_t* pmpdb);
-static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_record_t* records, uint32_t num_records);
-static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_record_t* records, uint32_t* num_records);
+static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_music_record_t* records, uint32_t num_records);
+static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_music_record_t* records, uint32_t* num_records);
static result_t pmpdb_dump(pmp_music_t* pmpdb, FILE *fp, int level);
static int pmpdb_is_supported_codec(pmp_music_t* pmpdb, uint32_t codec);
static int pmpdb_is_supported_ext(pmp_music_t* pmpdb, const ucs2char_t* filename);
@@ -537,7 +537,7 @@
return (path + length);
}
-static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_record_t* records, uint32_t num_records)
+static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_music_record_t* records, uint32_t num_records)
{
int i;
pmpdb_internal_t* pmpdbi = (pmpdb_internal_t*)pmpdb->instance;
@@ -545,7 +545,7 @@
ip3db_music_record_t* array = (ip3db_music_record_t*)malloc(sizeof(ip3db_music_record_t) * num_records);
for (i = 0;i < num_records;++i) {
- const pmp_record_t* src = &records[i];
+ const pmp_music_record_t* src = &records[i];
ip3db_variant_t* dst = array[i];
ip3db_record_init(&pmpdbi->ip3db, &array[i]);
@@ -582,7 +582,7 @@
return 0;
}
-static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_record_t* records, uint32_t* num_records)
+static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_music_record_t* records, uint32_t* num_records)
{
pmpdb_internal_t* pmpdbi = (pmpdb_internal_t*)pmpdb->instance;
pmp_internal_t* pmpi = (pmp_internal_t*)pmpdb->pmp->instance;
@@ -597,7 +597,7 @@
for (i = 0;i < n;++i) {
const ip3db_variant_t* src = (const ip3db_variant_t*)ip3db_get_record(db, i);
- pmp_record_t* dst = &records[i];
+ pmp_music_record_t* dst = &records[i];
size_t length = 0;
pmp_record_init(dst);
Modified: trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c
===================================================================
--- trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -96,8 +96,8 @@
static uint32_t pmpdb_release(pmp_music_t* pmpdb);
static result_t pmpdb_read(pmp_music_t* pmpdb);
static result_t pmpdb_write(pmp_music_t* pmpdb);
-static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_record_t* records, uint32_t num_records);
-static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_record_t* records, uint32_t* num_records);
+static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_music_record_t* records, uint32_t num_records);
+static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_music_record_t* records, uint32_t* num_records);
static result_t pmpdb_dump(pmp_music_t* pmpdb, FILE *fp, int level);
static int pmpdb_is_supported_codec(pmp_music_t* pmpdb, uint32_t codec);
static int pmpdb_is_supported_ext(pmp_music_t* pmpdb, const ucs2char_t* filename);
@@ -444,7 +444,7 @@
return ret;
}
-result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_record_t* records, uint32_t num_records)
+result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_music_record_t* records, uint32_t num_records)
{
irivnavi_t* db = (irivnavi_t*)pmpdb->instance;
result_t ret = 0;
@@ -469,9 +469,9 @@
return PMPDBE_OUTOFMEMORY;
}
- // Convert records from pmp_record_t to ip2db_record_t.
+ // Convert records from pmp_music_record_t to ip2db_record_t.
for (i = 0, j = 0;i < num_records;++i) {
- const pmp_record_t* src = &records[i];
+ const pmp_music_record_t* src = &records[i];
record_t* dst = &db->records[j];
// Skip unsupported codec.
@@ -496,7 +496,7 @@
return 0;
}
-static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_record_t* records, uint32_t* num_records)
+static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_music_record_t* records, uint32_t* num_records)
{
irivnavi_t* db = (irivnavi_t*)pmpdb->instance;
result_t ret = 0;
@@ -521,7 +521,7 @@
size_t length = 0;
ucs2char_t* tmp = NULL;
const record_t* src = &db->records[i];
- pmp_record_t* dst = &records[j];
+ pmp_music_record_t* dst = &records[j];
pmp_record_init(dst);
Modified: trunk/pmplib/lib/pmp_portalplayer1/model_iriver_h10.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/model_iriver_h10.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_portalplayer1/model_iriver_h10.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -92,7 +92,7 @@
fprints(fp, " unknown7: %s\n", record->fields[PP1DB_DATFIELD_UNKNOWN7].value.str);
}
-int iriver_h10_dat_set(dat_t* dst, const pmp_record_t* src, const ucs2char_t* path_to_root)
+int iriver_h10_dat_set(dat_t* dst, const pmp_music_record_t* src, const ucs2char_t* path_to_root)
{
static const ucs2char_t ucs2cs_unknown[] = {0};
static const ucs2char_t ucs2cs_empty[] = {0};
@@ -129,7 +129,7 @@
return 0;
}
-int iriver_h10_dat_get(pmp_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root)
+int iriver_h10_dat_get(pmp_music_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root)
{
static const ucs2char_t ucs2cs_mp3[] = {'.','m','p','3',0};
static const ucs2char_t ucs2cs_wma[] = {'.','w','m','a',0};
Modified: trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke220.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke220.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke220.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -78,7 +78,7 @@
fprints(fp, " composer: %s\n", record->fields[PP1DB_DATFIELD_COMPOSER].value.str);
}
-int medion_mdjuke220_dat_set(dat_t* dst, const pmp_record_t* src, const ucs2char_t* path_to_root)
+int medion_mdjuke220_dat_set(dat_t* dst, const pmp_music_record_t* src, const ucs2char_t* path_to_root)
{
ucs2char_t duration[128];
static const ucs2char_t ucs2cs_unknown[] = {'0',0};
@@ -112,7 +112,7 @@
return 0;
}
-int medion_mdjuke220_dat_get(pmp_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root)
+int medion_mdjuke220_dat_get(pmp_music_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root)
{
static const ucs2char_t ucs2cs_mp3[] = {'.','m','p','3',0};
static const ucs2char_t ucs2cs_wma[] = {'.','w','m','a',0};
Modified: trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke440.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke440.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke440.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -67,7 +67,7 @@
fprints(fp, " composer: %s\n", record->fields[PP1DB_DATFIELD_COMPOSER].value.str);
}
-int medion_mdjuke440_dat_set(dat_t* dst, const pmp_record_t* src, const ucs2char_t* path_to_root)
+int medion_mdjuke440_dat_set(dat_t* dst, const pmp_music_record_t* src, const ucs2char_t* path_to_root)
{
static const ucs2char_t ucs2cs_unknown[] = {'0',0};
@@ -91,7 +91,7 @@
return 0;
}
-int medion_mdjuke440_dat_get(pmp_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root)
+int medion_mdjuke440_dat_get(pmp_music_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root)
{
static const ucs2char_t ucs2cs_mp3[] = {'.','m','p','3',0};
static const ucs2char_t ucs2cs_wma[] = {'.','w','m','a',0};
Modified: trunk/pmplib/lib/pmp_portalplayer1/model_philips_hdd6320.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/model_philips_hdd6320.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_portalplayer1/model_philips_hdd6320.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -82,7 +82,7 @@
fprintf(fp, " unknown9: %d\n", record->fields[PP1DB_DATFIELD_UNKNOWN9].value.dword);
}
-static int philips_hdd6320_dat_set(dat_t* dst, const pmp_record_t* src, const ucs2char_t* path_to_root)
+static int philips_hdd6320_dat_set(dat_t* dst, const pmp_music_record_t* src, const ucs2char_t* path_to_root)
{
static const ucs2char_t ucs2cs_unknown[] = {0};
static const ucs2char_t ucs2cs_empty[] = {0};
@@ -113,7 +113,7 @@
return 0;
}
-static int philips_hdd6320_dat_get(pmp_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root)
+static int philips_hdd6320_dat_get(pmp_music_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root)
{
static const ucs2char_t ucs2cs_mp3[] = {'.','m','p','3',0};
static const ucs2char_t ucs2cs_wma[] = {'.','w','m','a',0};
Modified: trunk/pmplib/lib/pmp_portalplayer1/model_samsung.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/model_samsung.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_portalplayer1/model_samsung.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -84,7 +84,7 @@
fprints(fp, " unknown7: %s\n", record->fields[PP1DB_DATFIELD_UNKNOWN7].value.str);
}
-static int samsung_dat_set(dat_t* dst, const pmp_record_t* src, const ucs2char_t* path_to_root)
+static int samsung_dat_set(dat_t* dst, const pmp_music_record_t* src, const ucs2char_t* path_to_root)
{
static const ucs2char_t ucs2cs_unknown[] = {0};
static const ucs2char_t ucs2cs_empty[] = {0};
@@ -117,7 +117,7 @@
return 0;
}
-static int samsung_dat_get(pmp_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root)
+static int samsung_dat_get(pmp_music_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root)
{
static const ucs2char_t ucs2cs_mp3[] = {'.','m','p','3',0};
static const ucs2char_t ucs2cs_wma[] = {'.','w','m','a',0};
Modified: trunk/pmplib/lib/pmp_portalplayer1/model_sirius_s50.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/model_sirius_s50.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_portalplayer1/model_sirius_s50.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -97,7 +97,7 @@
fprintf(fp, " unknown15: %d\n", record->fields[PP1DB_DATFIELD_UNKNOWN15].value.dword);
}
-int sirius_s50_dat_set(dat_t* dst, const pmp_record_t* src, const ucs2char_t* path_to_root)
+int sirius_s50_dat_set(dat_t* dst, const pmp_music_record_t* src, const ucs2char_t* path_to_root)
{
static const ucs2char_t ucs2cs_unknown[] = {0};
static const ucs2char_t ucs2cs_empty[] = {0};
@@ -136,7 +136,7 @@
return 0;
}
-int sirius_s50_dat_get(pmp_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root)
+int sirius_s50_dat_get(pmp_music_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root)
{
static const ucs2char_t ucs2cs_mp3[] = {'.','m','p','3',0};
static const ucs2char_t ucs2cs_wma[] = {'.','w','m','a',0};
Modified: trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -226,8 +226,8 @@
static uint32_t pmpdb_release(pmp_music_t* pmpdb);
static result_t pmpdb_read(pmp_music_t* pmpdb);
static result_t pmpdb_write(pmp_music_t* pmpdb);
-static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_record_t* records, uint32_t num_records);
-static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_record_t* records, uint32_t* num_records);
+static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_music_record_t* records, uint32_t num_records);
+static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_music_record_t* records, uint32_t* num_records);
static result_t pmpdb_dump(pmp_music_t* pmpdb, FILE *fp, int level);
static int pmpdb_is_supported_codec(pmp_music_t* pmpdb, uint32_t codec);
static int pmpdb_is_supported_ext(pmp_music_t* pmpdb, const ucs2char_t* filename);
@@ -553,14 +553,14 @@
return pp1db_write(&pmpdbi->pp1db, pmpi->env.hdr_filename);
}
-static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_record_t* records, uint32_t num_records)
+static result_t pmpdb_set(pmp_music_t* pmpdb, const pmp_music_record_t* records, uint32_t num_records)
{
pmpdb_internal_t* pmpdbi = (pmpdb_internal_t*)pmpdb->instance;
pmp_internal_t* pmpi = (pmp_internal_t*)pmpdb->pmp->instance;
return pp1db_set(&pmpdbi->pp1db, records, num_records, pmpi->env.path_to_root);
}
-static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_record_t* records, uint32_t* num_records)
+static result_t pmpdb_get(pmp_music_t* pmpdb, pmp_music_record_t* records, uint32_t* num_records)
{
pmpdb_internal_t* pmpdbi = (pmpdb_internal_t*)pmpdb->instance;
pmp_internal_t* pmpi = (pmp_internal_t*)pmpdb->pmp->instance;
Modified: trunk/pmplib/lib/pmp_portalplayer1/pp1db.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/pp1db.c 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_portalplayer1/pp1db.c 2007-01-07 18:19:50 UTC (rev 249)
@@ -48,8 +48,8 @@
#endif
void dat_h10_repr(const dat_t* record, FILE *fp);
-int dat_h10_set(dat_t* dst, const pmp_record_t* src, const ucs2char_t* path_to_root);
-int dat_h10_get(pmp_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root);
+int dat_h10_set(dat_t* dst, const pmp_music_record_t* src, const ucs2char_t* path_to_root);
+int dat_h10_get(pmp_music_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root);
void pp1db_init(pp1db_t* db, hdr_init_t hdrinit)
@@ -433,7 +433,7 @@
}
-result_t pp1db_set(pp1db_t* db, const pmp_record_t* records, uint32_t num_records, ucs2char_t* path_to_root)
+result_t pp1db_set(pp1db_t* db, const pmp_music_record_t* records, uint32_t num_records, ucs2char_t* path_to_root)
{
uint32_t i, j, n = 0;
sort_item_t* si = NULL;
@@ -458,9 +458,9 @@
return PMP_INSUFFICIENTMEMORY;
}
- // Convert records from pmp_record_t to ip2db_record_t.
+ // Convert records from pmp_music_record_t to ip2db_record_t.
for (i = 0, j = 0;i < num_records;++i) {
- const pmp_record_t* src = &records[i];
+ const pmp_music_record_t* src = &records[i];
dat_t* dst = &db->dat[j];
// Skip invalid entries.
@@ -530,7 +530,7 @@
return 0;
}
-result_t pp1db_get(pp1db_t* db, pmp_record_t* records, uint32_t* num_records, ucs2char_t* path_to_root)
+result_t pp1db_get(pp1db_t* db, pmp_music_record_t* records, uint32_t* num_records, ucs2char_t* path_to_root)
{
uint32_t i = 0, j = 0, n = 0;
@@ -558,7 +558,7 @@
for (i = 0, j = 0;i < db->hdr->num_dat_entries;++i) {
const dat_t* src = &db->dat[i];
- pmp_record_t* dst = &records[j];
+ pmp_music_record_t* dst = &records[j];
pmp_record_init(dst);
db->hdr->param.proc_dat_get(dst, src, path_to_root);
Modified: trunk/pmplib/lib/pmp_portalplayer1/pp1db.h
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/pp1db.h 2007-01-07 18:12:54 UTC (rev 248)
+++ trunk/pmplib/lib/pmp_portalplayer1/pp1db.h 2007-01-07 18:19:50 UTC (rev 249)
@@ -69,8 +69,8 @@
} field_descriptor_t;
typedef void (*dat_repr_t)(const dat_t* record, FILE *fp);
-typedef int (*dat_set_t)(dat_t* dst, const pmp_record_t* src, const ucs2char_t* path_to_root);
-typedef int (*dat_get_t)(pmp_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root);
+typedef int (*dat_set_t)(dat_t* dst, const pmp_music_record_t* src, const ucs2char_t* path_to_root);
+typedef int (*dat_get_t)(pmp_music_record_t* dst, const dat_t* src, const ucs2char_t* path_to_root);
typedef struct {
size_t size;
@@ -164,8 +164,8 @@
result_t pp1db_repr(pp1db_t* db, FILE *fp, int level);
int pp1db_is_supported_ext(const ucs2char_t* filename);
int pp1db_is_supported_codec(uint32_t codec);
-result_t pp1db_set(pp1db_t* db, const pmp_record_t* records, uint32_t num_records, ucs2char_t* path_to_root);
-result_t pp1db_get(pp1db_t* db, pmp_record_t* records, uint32_t* num_records, ucs2char_t* path_to_root);
+result_t pp1db_set(pp1db_t* db, const pmp_music_record_t* records, uint32_t num_records, ucs2char_t* path_to_root);
+result_t pp1db_get(pp1db_t* db, pmp_music_record_t* records, uint32_t* num_records, ucs2char_t* path_to_root);
#endif/*__PP1DB_H__*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
