Menu
▾
▴
[Pmplib-commits] SF.net SVN: pmplib: [277] trunk/pmplib
|
From: <ny...@us...> - 2007-01-25 22:16:17
|
Revision: 277
http://svn.sourceforge.net/pmplib/?rev=277&view=rev
Author: nyaochi
Date: 2007-01-25 14:16:09 -0800 (Thu, 25 Jan 2007)
Log Message:
-----------
Update API documentations and function names.
Modified Paths:
--------------
trunk/pmplib/frontend/easypmp/common/database.c
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/pmp.h
trunk/pmplib/lib/pmp/pmp.c
trunk/pmplib/lib/pmp/pmp_win32.c
trunk/pmplib/lib/pmp_iriverplus2/ip2db.c
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/pmp_portalplayer1.c
trunk/pmplib/lib/pmp_portalplayer1/pp1db.c
Modified: trunk/pmplib/frontend/easypmp/common/database.c
===================================================================
--- trunk/pmplib/frontend/easypmp/common/database.c 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/frontend/easypmp/common/database.c 2007-01-25 22:16:09 UTC (rev 277)
@@ -201,7 +201,7 @@
}
// Initialize the record.
- pmp_record_init(record);
+ pmplib_record_init(record);
// Determine if we can skip obtaining a media information from this file.
if (opt->verb & MODE_DATABASE_UPDATE) {
@@ -211,7 +211,7 @@
if (begin + 1 == end) {
// If the time stamps are identical, let us skip this file.
if (old_records[begin].ts_update == timestamp) {
- pmp_record_clone(record, &old_records[begin]);
+ pmplib_record_clone(record, &old_records[begin]);
is_skipping = 1;
}
}
@@ -275,7 +275,7 @@
*/
if (old_records) {
for (i = 0;i < num_old_records;++i) {
- pmp_record_finish(&old_records[i]);
+ pmplib_record_finish(&old_records[i]);
}
free(old_records);
}
@@ -287,7 +287,7 @@
} else {
/* Free the record array. */
for (i = 0;i < fl->num_elements;++i) {
- pmp_record_finish(&records[i]);
+ pmplib_record_finish(&records[i]);
}
free(records);
}
Modified: trunk/pmplib/frontend/easypmp/common/playlist.c
===================================================================
--- trunk/pmplib/frontend/easypmp/common/playlist.c 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/frontend/easypmp/common/playlist.c 2007-01-25 22:16:09 UTC (rev 277)
@@ -261,7 +261,7 @@
error_exit:
for (i = 0;i < num_pmppls;++i) {
- pmp_playlist_finish(&pmppls[i]);
+ pmplib_playlist_finish(&pmppls[i]);
}
free(pmppls);
free(mediafiles);
Modified: trunk/pmplib/frontend/easypmp/cui/main.c
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/main.c 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/frontend/easypmp/cui/main.c 2007-01-25 22:16:09 UTC (rev 277)
@@ -393,7 +393,7 @@
/* Free the record array. */
int i;
for (i = 0;i < num_records;++i) {
- pmp_record_finish(&records[i]);
+ pmplib_record_finish(&records[i]);
}
free(records);
}
Modified: trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h
===================================================================
--- trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h 2007-01-25 22:16:09 UTC (rev 277)
@@ -438,7 +438,7 @@
/* Free the record array. */
int i;
for (i = 0;i < num_records;++i) {
- pmp_record_finish(&records[i]);
+ pmplib_record_finish(&records[i]);
}
free(records);
}
@@ -452,7 +452,7 @@
/* Free the record array. */
int i;
for (i = 0;i < num_records;++i) {
- pmp_record_finish(&records[i]);
+ pmplib_record_finish(&records[i]);
}
free(records);
}
Modified: trunk/pmplib/include/gmi.h
===================================================================
--- trunk/pmplib/include/gmi.h 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/include/gmi.h 2007-01-25 22:16:09 UTC (rev 277)
@@ -55,7 +55,7 @@
};
#define media_info_t pmp_music_record_t
-#define gmi_finish pmp_record_finish
+#define gmi_finish pmplib_record_finish
GMIAPI int gmi_get(
media_info_t* info,
Modified: trunk/pmplib/include/pmp.h
===================================================================
--- trunk/pmplib/include/pmp.h 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/include/pmp.h 2007-01-25 22:16:09 UTC (rev 277)
@@ -103,19 +103,17 @@
};
/**
- * Fourcc representation of codecs.
+ * Macro to define FourCC representations of codecs.
*/
#define PMPFOURCC(a, b, c, d) \
((uint32_t)(a) << 24 | (uint32_t)(b) << 16 | (uint32_t)(c) << 8 | (uint32_t)(d))
-#define PMPCODEC_NONE PMPFOURCC(' ',' ',' ',' ')
+#define PMPCODEC_NONE PMPFOURCC(' ',' ',' ',' ') /**< Unknown codec. */
#define PMPCODEC_MPEGLAYER3 PMPFOURCC('M','P','1','3') /**< MPEG Audio Layer III */
#define PMPCODEC_WMA PMPFOURCC('W','M','A',' ') /**< Windows Media Audio */
#define PMPCODEC_VORBIS PMPFOURCC('O','V','1',' ') /**< Ogg Vorbis */
#define PMPCODEC_WAV PMPFOURCC('W','A','V','E') /**< Microsoft Riff WAVE */
-#define PMPMAXCODECS 32
-
enum {
PMPPEF_NONE = 0x0000,
PMPPEF_SUPPORT = 0x0001,
@@ -136,6 +134,12 @@
};
+
+/**
+ * @defgroup device PMPlib Device API
+ * @{
+ */
+
/** Maximum size, in chars, of a device description. */
#define PMP_DECLSIZE (128)
/** Unavailable field of a device description. */
@@ -201,8 +205,6 @@
const pmp_device_description_t decl;
} pmp_device_information_t;
-
-
/**
* The root interface for portable media device.
*
@@ -279,30 +281,132 @@
result_t (*close)(pmp_t* pmp);
};
-typedef void pmpdb_readwrite_progress_t(void *instance, uint32_t size, uint32_t total);
+/**
+ * @}
+ */
/**
- * Structure of media record.
+ * @defgroup music PMPlib Music API
+ * @{
*/
+
+/**
+ * Structure for a music record.
+ */
struct tag_pmp_music_record_t {
- ucs2char_t *filename; /**< Filename. */
- ucs2char_t *title; /**< Track title. */
- ucs2char_t *artist; /**< Artist name. */
- ucs2char_t *composer; /**< Composer name. */
- ucs2char_t *album; /**< Album name. */
- ucs2char_t *genre; /**< Genre name. */
- ucs2char_t *date; /**< Date. */
- uint32_t codec; /**< Codec FourCC. */
- uint32_t track_number; /**< Track number. */
- uint32_t sample_rate; /**< Sample rate in kHz. */
- uint32_t bitrate; /**< Bitrate in bps. */
- uint32_t duration; /**< Duration in seconds. */
- uint32_t filesize; /**< File size in bytes. */
- uint32_t ts_update; /**< Last update. */
- uint32_t rating; /**< Rating of the track. */
- uint32_t play_count; /**< The number of playback of the track. */
- uint32_t ts_playback; /**< Date/time of recent playback of the track. */
- uint32_t ts_import; /**< Date/time when the track was imported. */
+ /**
+ * Relative path for the music file from the mount location of the device.
+ * The path character must be '\\' on all platforms (including POSIX).
+ * e.g., "\\Music\\Beatles\\AbbeyRoad\\01_AbbeyRoad.mp3"
+ * @assert @code filename != NULL @endcode
+ */
+ ucs2char_t *filename;
+
+ /**
+ * Title name.
+ * e.g., "Come Together"
+ * @assert @code title != NULL @endcode
+ */
+ ucs2char_t *title;
+
+ /**
+ * Artist name.
+ * e.g., "The Beatles"
+ * @assert @code artist != NULL @endcode
+ */
+ ucs2char_t *artist;
+
+ /**
+ * Composer.
+ * e.g., "John Lennon"
+ * @assert @code composer != NULL @endcode
+ */
+ ucs2char_t *composer;
+
+ /**
+ * Album name.
+ * e.g., "Abbey Road"
+ * @assert @code album != NULL @endcode
+ */
+ ucs2char_t *album;
+
+ /**
+ * Genre name.
+ * e.g., "Rock"
+ * @assert @code genre != NULL @endcode
+ */
+ ucs2char_t *genre;
+
+ /**
+ * Release date.
+ * e.g., "1969"
+ * @assert @code date != NULL @endcode
+ */
+ ucs2char_t *date;
+
+ /**
+ * FourCC representation of the codec.
+ * e.g., PMPCODEC_MPEGLAYER3
+ */
+ uint32_t codec;
+
+ /**
+ * Track number.
+ * e.g., 1
+ */
+ uint32_t track_number;
+
+ /**
+ * Sample rate in [Hz].
+ * e.g., 44100
+ */
+ uint32_t sample_rate;
+
+ /**
+ * Bitrate in [bps].
+ * e.g., 128000
+ */
+ uint32_t bitrate;
+
+ /**
+ * Duration in seconds.
+ * e.g., 260
+ */
+ uint32_t duration;
+
+ /**
+ * File size in bytes.
+ * e.g., 4160000
+ */
+ uint32_t filesize;
+
+ /**
+ * Timestamp of the last update of the music file.
+ * The value is equivalent to \c st.st_mtime after \c stat(&st, filename);
+ */
+ uint32_t ts_update;
+
+ /**
+ * Rating.
+ * e.g., 5
+ */
+ uint32_t rating;
+
+ /**
+ * Play count on the device.
+ * e.g., 23
+ */
+ uint32_t play_count;
+
+ /**
+ * Timestamp of the recent playback on the device.
+ */
+ uint32_t ts_playback;
+
+ /**
+ * timestamp when the track was imported.
+ */
+ uint32_t ts_import;
};
typedef struct tag_pmp_music_record_t pmp_music_record_t;
@@ -461,34 +565,85 @@
result_t (*dump)(pmp_music_t* music, FILE *fp, int flag);
};
+/**
+ * Initialize pmp_music_record_t structure.
+ *
+ * @param record The pointer to pmp_music_record_t instance.
+ */
+PMPAPI void pmplib_record_init(pmp_music_record_t* record);
-typedef result_t (*pmp_create_t)(pmp_t** pmp, const ucs2char_t* path_to_device, const char *devid);
+/**
+ * Uninitialize pmp_music_record_t structure.
+ *
+ * This function frees the memory blocks used by the \a record.
+ *
+ * @param record The pointer to pmp_music_record_t instance.
+ */
+PMPAPI void pmplib_record_finish(pmp_music_record_t* record);
/**
+ * Clone a pmp_music_record_t record.
+ *
+ * This function copies the values in the \a src record to \a dst.
+ *
+ * @param dst The pointer to the destination.
+ * @param src The pointer to the source.
+ * @retval result_t The status code after this operation.
+ */
+PMPAPI result_t pmplib_record_clone(pmp_music_record_t* dst, const pmp_music_record_t* src);
+
+/**
+ * Uninitialize an array of pmp_music_record_t records.
+ *
+ * This function frees the memory blocks used by each record in the array and
+ * the array.
+ *
+ * @param record The pointer to pmp_music_record_t array.
+ * @param num_records The number of elements in the array.
+ */
+PMPAPI void pmplib_records_finish(pmp_music_record_t* records, int num_records);
+
+/**
+ * Clone a pmp_music_record_t array.
+ *
+ * This function copies all records in the \a src array to \a dst.
+ *
+ * @param dst The destination array.
+ * @param src The source array.
+ * @param num_records The number of elements in the source array.
+ * @retval result_t The status code after this operation.
+ */
+PMPAPI result_t pmplib_records_clone(pmp_music_record_t* dst, const pmp_music_record_t* src, int num_records);
+
+PMPAPI void pmplib_playlist_init(pmp_playlist_t* playlist);
+PMPAPI void pmplib_playlist_finish(pmp_playlist_t* playlist);
+PMPAPI void pmplib_playlist_copy(pmp_playlist_t* dst, const pmp_playlist_t* src);
+
+/**
+ * @}
+ */
+
+
+typedef result_t (*pmplib_create_t)(pmp_t** pmp, const ucs2char_t* path_to_device, const char *devid);
+
+/**
* Prototype for the callback function for receiving device identifiers.
*
*/
-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);
+typedef void (*pmplib_enumerate_devid_callback_t)(void *instance, const char *devid);
+typedef result_t (*pmplib_enumerate_devid_t)(pmplib_enumerate_devid_callback_t callback, void *instance);
-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_clone(pmp_music_record_t* dst, const pmp_music_record_t* src);
-PMPAPI void pmp_records_finish(pmp_music_record_t* records, int num_records);
-PMPAPI result_t pmp_records_clone(pmp_music_record_t* dst, const pmp_music_record_t* src, int num_records);
+PMPAPI uint32_t pmplib_interlocked_increment(uint32_t* count);
+PMPAPI uint32_t pmplib_interlocked_decrement(uint32_t* count);
-PMPAPI uint32_t pmp_interlocked_increment(uint32_t* count);
-PMPAPI uint32_t pmp_interlocked_decrement(uint32_t* count);
-PMPAPI void pmp_playlist_init(pmp_playlist_t* playlist);
-PMPAPI void pmp_playlist_finish(pmp_playlist_t* playlist);
-PMPAPI void pmp_playlist_copy(pmp_playlist_t* dst, const pmp_playlist_t* src);
/**
* @defgroup pmplib PMPlib Helper API
+ * @{
*
* The PMPlib Helper API provides the utility for choosing a suitable PMPlib
* driver from a number of installed drivers. Because the PMPlib project
@@ -649,7 +804,7 @@
* @code pmplib != NULL @endcode
* @code callback != NULL @endcode
*/
-PMPAPI result_t pmplib_enumerate_devid(pmplib_t* pmplib, pmp_enumerate_devid_callback_t callback, void *instance);
+PMPAPI result_t pmplib_enumerate_devid(pmplib_t* pmplib, pmplib_enumerate_devid_callback_t callback, void *instance);
/**
* @}
Modified: trunk/pmplib/lib/pmp/pmp.c
===================================================================
--- trunk/pmplib/lib/pmp/pmp.c 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/lib/pmp/pmp.c 2007-01-25 22:16:09 UTC (rev 277)
@@ -34,13 +34,13 @@
#include <ucs2char.h>
#include <pmp.h>
-void pmp_record_init(pmp_music_record_t* record)
+void pmplib_record_init(pmp_music_record_t* record)
{
memset(record, 0, sizeof(*record));
}
-void pmp_record_finish(pmp_music_record_t* record)
+void pmplib_record_finish(pmp_music_record_t* record)
{
ucs2free(record->filename);
ucs2free(record->title);
@@ -48,10 +48,10 @@
ucs2free(record->album);
ucs2free(record->genre);
ucs2free(record->date);
- pmp_record_init(record);
+ pmplib_record_init(record);
}
-result_t pmp_record_clone(pmp_music_record_t* dst, const pmp_music_record_t* src)
+result_t pmplib_record_clone(pmp_music_record_t* dst, const pmp_music_record_t* src)
{
memcpy(dst, src, sizeof(*src));
dst->filename = src->filename ? ucs2dup(src->filename) : NULL;
@@ -63,29 +63,29 @@
return 0;
}
-void pmp_records_finish(pmp_music_record_t* records, int num_records)
+void pmplib_records_finish(pmp_music_record_t* records, int num_records)
{
int i;
for (i = 0;i < num_records;++i) {
- pmp_record_finish(&records[i]);
+ pmplib_record_finish(&records[i]);
}
ucs2free(records);
}
-result_t pmp_records_clone(pmp_music_record_t* dst, const pmp_music_record_t* src, int num_records)
+result_t pmplib_records_clone(pmp_music_record_t* dst, const pmp_music_record_t* src, int num_records)
{
int i;
for (i = 0;i < num_records;++i) {
- pmp_record_clone(&dst[i], &src[i]);
+ pmplib_record_clone(&dst[i], &src[i]);
}
}
-void pmp_playlist_init(pmp_playlist_t* playlist)
+void pmplib_playlist_init(pmp_playlist_t* playlist)
{
memset(playlist, 0, sizeof(*playlist));
}
-void pmp_playlist_finish(pmp_playlist_t* playlist)
+void pmplib_playlist_finish(pmp_playlist_t* playlist)
{
int i;
for (i = 0;i < playlist->num_entries;++i) {
@@ -95,7 +95,7 @@
ucs2free(playlist->name);
}
-void pmp_playlist_copy(pmp_playlist_t* dst, const pmp_playlist_t* src)
+void pmplib_playlist_copy(pmp_playlist_t* dst, const pmp_playlist_t* src)
{
int i;
Modified: trunk/pmplib/lib/pmp/pmp_win32.c
===================================================================
--- trunk/pmplib/lib/pmp/pmp_win32.c 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/lib/pmp/pmp_win32.c 2007-01-25 22:16:09 UTC (rev 277)
@@ -40,12 +40,12 @@
};
-uint32_t pmp_interlocked_increment(uint32_t* count)
+uint32_t pmplib_interlocked_increment(uint32_t* count)
{
return (uint32_t)InterlockedIncrement((LONG*)count);
}
-uint32_t pmp_interlocked_decrement(uint32_t* count)
+uint32_t pmplib_interlocked_decrement(uint32_t* count)
{
return (uint32_t)InterlockedDecrement((LONG*)count);
}
@@ -101,11 +101,11 @@
return 0;
}
-result_t pmplib_enumerate_devid(pmplib_t* pmplib, pmp_enumerate_devid_callback_t callback, void *instance)
+result_t pmplib_enumerate_devid(pmplib_t* pmplib, pmplib_enumerate_devid_callback_t callback, void *instance)
{
uint32_t i;
for (i = 0;i < pmplib->num_plugins;++i) {
- pmp_enumerate_devid_t func = (pmp_enumerate_devid_t)GetProcAddress(pmplib->plugins[i], "pmp_enumerate_devid");
+ pmplib_enumerate_devid_t func = (pmplib_enumerate_devid_t)GetProcAddress(pmplib->plugins[i], "pmp_enumerate_devid");
if (func) {
func(callback, instance);
}
@@ -119,7 +119,7 @@
result_t ret = PMP_DEVICENOTFOUND;
for (i = 0;i < pmplib->num_plugins;++i) {
- pmp_create_t func = (pmp_create_t)GetProcAddress(pmplib->plugins[i], "pmp_create");
+ pmplib_create_t func = (pmplib_create_t)GetProcAddress(pmplib->plugins[i], "pmp_create");
if (func) {
ret = func(pmp, path_to_device, id);
if (ret != PMP_DEVICENOTFOUND) {
Modified: trunk/pmplib/lib/pmp_iriverplus2/ip2db.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/ip2db.c 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/lib/pmp_iriverplus2/ip2db.c 2007-01-25 22:16:09 UTC (rev 277)
@@ -264,7 +264,7 @@
ip2db_record_t src;
pmp_music_record_t* dst = &records[j];
- pmp_record_init(dst);
+ pmplib_record_init(dst);
ip2db_get_record(db, i, &src);
Modified: trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c 2007-01-25 22:16:09 UTC (rev 277)
@@ -282,7 +282,7 @@
-PMPIRIVERPLUS2API result_t pmp_enumerate_devid(pmp_enumerate_devid_callback_t callback, void *instance)
+PMPIRIVERPLUS2API result_t pmp_enumerate_devid(pmplib_enumerate_devid_callback_t callback, void *instance)
{
const ip2model_descriptor_t* md = g_model_descriptions;
for (;md->id;++md) {
@@ -378,12 +378,12 @@
static uint32_t pmp_add_ref(pmp_t* pmp)
{
- return pmp_interlocked_increment(&pmp->ref_count);
+ return pmplib_interlocked_increment(&pmp->ref_count);
}
static uint32_t pmp_release(pmp_t* pmp)
{
- uint32_t count = pmp_interlocked_decrement(&pmp->ref_count);
+ uint32_t count = pmplib_interlocked_decrement(&pmp->ref_count);
if (count == 0) {
pmpdb_release(pmp->music);
free(pmp->instance);
@@ -552,12 +552,12 @@
static uint32_t pmppl_add_ref(pmp_playlist_t* pmppl)
{
- return pmp_interlocked_increment(&pmppl->ref_count);
+ return pmplib_interlocked_increment(&pmppl->ref_count);
}
static uint32_t pmppl_release(pmp_playlist_t* pmppl)
{
- uint32_t count = pmp_interlocked_decrement(&pmppl->ref_count);
+ uint32_t count = pmplib_interlocked_decrement(&pmppl->ref_count);
if (count == 0) {
pmppl_internal_t* pmppli = (pmppl_internal_t*)pmppl->instance;
free(pmppl->instance);
Modified: trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c 2007-01-25 22:16:09 UTC (rev 277)
@@ -304,7 +304,7 @@
-PMPIRIVERPLUS3API result_t pmp_enumerate_devid(pmp_enumerate_devid_callback_t callback, void *instance)
+PMPIRIVERPLUS3API result_t pmp_enumerate_devid(pmplib_enumerate_devid_callback_t callback, void *instance)
{
const ip3model_descriptor_t* md = g_model_descriptions;
for (;md->id;++md) {
@@ -388,12 +388,12 @@
static uint32_t pmp_add_ref(pmp_t* pmp)
{
- return pmp_interlocked_increment(&pmp->ref_count);
+ return pmplib_interlocked_increment(&pmp->ref_count);
}
static uint32_t pmp_release(pmp_t* pmp)
{
- uint32_t count = pmp_interlocked_decrement(&pmp->ref_count);
+ uint32_t count = pmplib_interlocked_decrement(&pmp->ref_count);
if (count == 0) {
pmpmusic_release(pmp->music);
free_device_info(&pmp->info);
@@ -470,7 +470,7 @@
{
pmp_music_internal_t* pmpmi = (pmp_music_internal_t*)music->instance;
ip3db_finish(&pmpmi->ip3db);
- pmp_records_finish(pmpmi->records, pmpmi->num_records);
+ pmplib_records_finish(pmpmi->records, pmpmi->num_records);
free(pmpmi->playlists);
free(pmpmi);
free(music);
@@ -484,7 +484,7 @@
pmp_music_internal_t* pmpmi = (pmp_music_internal_t*)music->instance;
// Free the existing records.
- pmp_records_finish(pmpmi->records, pmpmi->num_records);
+ pmplib_records_finish(pmpmi->records, pmpmi->num_records);
pmpmi->records = 0;
pmpmi->num_records = 0;
@@ -513,7 +513,7 @@
pmp_music_record_t* dst = &pmpmi->records[i];
size_t length = 0;
- pmp_record_init(dst);
+ pmplib_record_init(dst);
length = ucs2len(pmp->info.path_to_root);
length += ucs2len(src[IP3DBF_MUSIC_FILEPATH].value.str);
@@ -636,12 +636,12 @@
pmp_music_internal_t* pmpmi = (pmp_music_internal_t*)music->instance;
/* Free records attached to pmpmi. */
- pmp_records_finish(pmpmi->records, pmpmi->num_records);
+ pmplib_records_finish(pmpmi->records, pmpmi->num_records);
/* Allocate new records. */
pmpmi->records = (pmp_music_record_t*)ucs2malloc(sizeof(pmp_music_record_t) * num_records);
pmpmi->num_records = num_records;
- pmp_records_clone(pmpmi->records, records, num_records);
+ pmplib_records_clone(pmpmi->records, records, num_records);
return 0;
}
@@ -655,7 +655,7 @@
*num_records = pmpmi->num_records;
return 0;
} else if (*num_records == pmpmi->num_records) {
- pmp_records_clone(records, pmpmi->records, pmpmi->num_records);
+ pmplib_records_clone(records, pmpmi->records, pmpmi->num_records);
return 0;
} else {
return PMPDBE_INSUFFICIENT;
Modified: trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c
===================================================================
--- trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c 2007-01-25 22:16:09 UTC (rev 277)
@@ -115,7 +115,7 @@
return filepath_file_exists(filename);
}
-PMPIRIVNAVIAPI result_t pmp_enumerate_devid(pmp_enumerate_devid_callback_t callback, void *instance)
+PMPIRIVNAVIAPI result_t pmp_enumerate_devid(pmplib_enumerate_devid_callback_t callback, void *instance)
{
callback(instance, MODELID_H100);
callback(instance, MODELID_H300);
@@ -237,12 +237,12 @@
static uint32_t pmp_add_ref(pmp_t* pmp)
{
- return pmp_interlocked_increment(&pmp->ref_count);
+ return pmplib_interlocked_increment(&pmp->ref_count);
}
static uint32_t pmp_release(pmp_t* pmp)
{
- uint32_t count = pmp_interlocked_decrement(&pmp->ref_count);
+ uint32_t count = pmplib_interlocked_decrement(&pmp->ref_count);
if (count == 0) {
pmpdb_release(pmp->music);
free(pmp);
@@ -526,7 +526,7 @@
const record_t* src = &db->records[i];
pmp_music_record_t* dst = &records[j];
- pmp_record_init(dst);
+ pmplib_record_init(dst);
tmp = mbsdupucs2(src->filename);
length = ucs2len(path_to_root);
@@ -600,12 +600,12 @@
static uint32_t pmppl_add_ref(pmp_playlist_t* pmppl)
{
- return pmp_interlocked_increment(&pmppl->ref_count);
+ return pmplib_interlocked_increment(&pmppl->ref_count);
}
static uint32_t pmppl_release(pmp_playlist_t* pmppl)
{
- uint32_t count = pmp_interlocked_decrement(&pmppl->ref_count);
+ uint32_t count = pmplib_interlocked_decrement(&pmppl->ref_count);
if (count == 0) {
free(pmppl);
}
Modified: trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c 2007-01-25 22:16:09 UTC (rev 277)
@@ -345,7 +345,7 @@
-PMPPORTALPLAYER1API result_t pmp_enumerate_devid(pmp_enumerate_devid_callback_t callback, void *instance)
+PMPPORTALPLAYER1API result_t pmp_enumerate_devid(pmplib_enumerate_devid_callback_t callback, void *instance)
{
const pp1model_descriptor_t* md = g_model_descriptions;
for (;md->id;++md) {
@@ -444,12 +444,12 @@
static uint32_t pmp_add_ref(pmp_t* pmp)
{
- return pmp_interlocked_increment(&pmp->ref_count);
+ return pmplib_interlocked_increment(&pmp->ref_count);
}
static uint32_t pmp_release(pmp_t* pmp)
{
- uint32_t count = pmp_interlocked_decrement(&pmp->ref_count);
+ uint32_t count = pmplib_interlocked_decrement(&pmp->ref_count);
if (count == 0) {
pmpdb_release(pmp->music);
free(pmp->instance);
@@ -600,12 +600,12 @@
static uint32_t pmppl_add_ref(pmp_playlist_t* pmppl)
{
- return pmp_interlocked_increment(&pmppl->ref_count);
+ return pmplib_interlocked_increment(&pmppl->ref_count);
}
static uint32_t pmppl_release(pmp_playlist_t* pmppl)
{
- uint32_t count = pmp_interlocked_decrement(&pmppl->ref_count);
+ uint32_t count = pmplib_interlocked_decrement(&pmppl->ref_count);
if (count == 0) {
free(pmppl);
}
Modified: trunk/pmplib/lib/pmp_portalplayer1/pp1db.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/pp1db.c 2007-01-25 03:06:49 UTC (rev 276)
+++ trunk/pmplib/lib/pmp_portalplayer1/pp1db.c 2007-01-25 22:16:09 UTC (rev 277)
@@ -560,7 +560,7 @@
const dat_t* src = &db->dat[i];
pmp_music_record_t* dst = &records[j];
- pmp_record_init(dst);
+ pmplib_record_init(dst);
db->hdr->param.proc_dat_get(dst, src, path_to_root);
++j;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
