Menu
▾
▴
[Pmplib-commits] SF.net SVN: pmplib: [246] trunk/pmplib
|
From: <ny...@us...> - 2007-01-07 17:40:23
|
Revision: 246
http://svn.sourceforge.net/pmplib/?rev=246&view=rev
Author: nyaochi
Date: 2007-01-07 09:40:24 -0800 (Sun, 07 Jan 2007)
Log Message:
-----------
Removed pmp_music_t::add_ref() and pmp_music_t::release() as pmp_music_t now
sticks to pmp_t as pmp_t::music.
Modified Paths:
--------------
trunk/pmplib/frontend/easypmp/common/database.c
trunk/pmplib/include/pmp.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_irivnavi/pmp_irivnavi.vcproj
trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c
Modified: trunk/pmplib/frontend/easypmp/common/database.c
===================================================================
--- trunk/pmplib/frontend/easypmp/common/database.c 2007-01-07 17:31:09 UTC (rev 245)
+++ trunk/pmplib/frontend/easypmp/common/database.c 2007-01-07 17:40:24 UTC (rev 246)
@@ -297,13 +297,11 @@
int database_dump(pmp_t* pmp, FILE *fp, int level)
{
- pmp_music_t* pmpdb = NULL;
- pmp->create_instance_db(pmp, &pmpdb);
+ pmp_music_t* pmpdb = pmp->music;
if (!pmpdb) {
return 1;
}
pmpdb->dump(pmpdb, fp, level);
- pmpdb->release(pmpdb);
return 0;
}
Modified: trunk/pmplib/include/pmp.h
===================================================================
--- trunk/pmplib/include/pmp.h 2007-01-07 17:31:09 UTC (rev 245)
+++ trunk/pmplib/include/pmp.h 2007-01-07 17:40:24 UTC (rev 246)
@@ -165,12 +165,8 @@
struct tag_pmp_music_t {
void* instance;
- uint32_t ref_count;
pmp_t* pmp;
- uint32_t (*add_ref)(pmp_music_t* pmpdb);
- uint32_t (*release)(pmp_music_t* pmpdb);
-
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);
Modified: trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c 2007-01-07 17:31:09 UTC (rev 245)
+++ trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c 2007-01-07 17:40:24 UTC (rev 246)
@@ -122,7 +122,6 @@
static result_t pmp_is_supported_codec(pmp_t* pmp, uint32_t codec);
static result_t pmp_is_supported_ext(pmp_t* pmp, const ucs2char_t* filename);
-static uint32_t pmpdb_add_ref(pmp_music_t* pmpdb);
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);
@@ -431,8 +430,6 @@
return PMPDBE_OUTOFMEMORY;
}
- pmpdb->add_ref = pmpdb_add_ref;
- pmpdb->release = pmpdb_release;
pmpdb->set = pmpdb_set;
pmpdb->get = pmpdb_get;
pmpdb->dump = pmpdb_dump;
@@ -447,7 +444,6 @@
pmpdb->pmp = pmp;
pmpdb->instance = pmpdbi;
- pmpdb->add_ref(pmpdb);
*ptr_pmpdb = pmpdb;
return 0;
}
@@ -501,21 +497,13 @@
-static uint32_t pmpdb_add_ref(pmp_music_t* pmpdb)
-{
- return interlocked_increment(&pmpdb->ref_count);
-}
-
static uint32_t pmpdb_release(pmp_music_t* pmpdb)
{
- uint32_t count = interlocked_decrement(&pmpdb->ref_count);
- if (count == 0) {
- pmpdb_internal_t* pmpdbi = (pmpdb_internal_t*)pmpdb->instance;
- ip2db_finish(&pmpdbi->ip2db);
- free(pmpdb->instance);
- free(pmpdb);
- }
- return count;
+ pmpdb_internal_t* pmpdbi = (pmpdb_internal_t*)pmpdb->instance;
+ ip2db_finish(&pmpdbi->ip2db);
+ free(pmpdb->instance);
+ free(pmpdb);
+ return 0;
}
static result_t pmpdb_read(pmp_music_t* pmpdb)
Modified: trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c 2007-01-07 17:31:09 UTC (rev 245)
+++ trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c 2007-01-07 17:40:24 UTC (rev 246)
@@ -118,7 +118,6 @@
static result_t pmp_is_supported_codec(pmp_t* pmp, uint32_t codec);
static result_t pmp_is_supported_ext(pmp_t* pmp, const ucs2char_t* filename);
-static uint32_t pmpdb_add_ref(pmp_music_t* pmpdb);
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);
@@ -442,8 +441,6 @@
return PMPDBE_OUTOFMEMORY;
}
- pmpdb->add_ref = pmpdb_add_ref;
- pmpdb->release = pmpdb_release;
pmpdb->set = pmpdb_set;
pmpdb->get = pmpdb_get;
pmpdb->dump = pmpdb_dump;
@@ -458,7 +455,6 @@
pmpdb->pmp = pmp;
pmpdb->instance = pmpdbi;
- pmpdb->add_ref(pmpdb);
*ptr_pmpdb = pmpdb;
return 0;
}
@@ -491,7 +487,6 @@
pmppl->pmp = pmp;
pmppl->instance = pmppli;
- pmppl->add_ref(pmppl);
*ptr_pmppl = pmppl;
return 0;
}
@@ -524,21 +519,13 @@
-static uint32_t pmpdb_add_ref(pmp_music_t* pmpdb)
-{
- return interlocked_increment(&pmpdb->ref_count);
-}
-
static uint32_t pmpdb_release(pmp_music_t* pmpdb)
{
- uint32_t count = interlocked_decrement(&pmpdb->ref_count);
- if (count == 0) {
- pmpdb_internal_t* pmpdbi = (pmpdb_internal_t*)pmpdb->instance;
- ip3db_finish(&pmpdbi->ip3db);
- free(pmpdb->instance);
- free(pmpdb);
- }
- return count;
+ pmpdb_internal_t* pmpdbi = (pmpdb_internal_t*)pmpdb->instance;
+ ip3db_finish(&pmpdbi->ip3db);
+ free(pmpdb->instance);
+ free(pmpdb);
+ return 0;
}
static result_t pmpdb_read(pmp_music_t* pmpdb)
Modified: trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c
===================================================================
--- trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c 2007-01-07 17:31:09 UTC (rev 245)
+++ trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c 2007-01-07 17:40:24 UTC (rev 246)
@@ -315,8 +315,6 @@
}
// Set member methods.
- pmpdb->add_ref = pmpdb_add_ref;
- pmpdb->release = pmpdb_release;
pmpdb->set = pmpdb_set;
pmpdb->get = pmpdb_get;
pmpdb->dump = pmpdb_dump;
@@ -333,7 +331,6 @@
pmpdb->pmp = pmp;
pmpdb->instance = irivnavi;
- pmpdb->add_ref(pmpdb);
*ptr_pmpdb = pmpdb;
return 0;
}
@@ -361,23 +358,15 @@
return 0;
}
-static uint32_t pmpdb_add_ref(pmp_music_t* pmpdb)
-{
- return interlocked_increment(&pmpdb->ref_count);
-}
-
static uint32_t pmpdb_release(pmp_music_t* pmpdb)
{
- uint32_t count = interlocked_decrement(&pmpdb->ref_count);
- if (count == 0) {
- irivnavi_t* db = (irivnavi_t*)pmpdb->instance;
- if (db) {
- irivnavi_finish(db);
- free(db);
- }
- free(pmpdb);
+ irivnavi_t* db = (irivnavi_t*)pmpdb->instance;
+ if (db) {
+ irivnavi_finish(db);
+ free(db);
}
- return count;
+ free(pmpdb);
+ return 0;
}
result_t pmpdb_read(pmp_music_t* pmpdb)
Modified: trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.vcproj
===================================================================
--- trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.vcproj 2007-01-07 17:31:09 UTC (rev 245)
+++ trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.vcproj 2007-01-07 17:40:24 UTC (rev 246)
@@ -186,6 +186,10 @@
>
</File>
<File
+ RelativePath=".\irivnavi.h"
+ >
+ </File>
+ <File
RelativePath=".\playlist.c"
>
</File>
@@ -204,10 +208,6 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath=".\irivnavi.h"
- >
- </File>
- <File
RelativePath=".\serialize.h"
>
</File>
Modified: trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c 2007-01-07 17:31:09 UTC (rev 245)
+++ trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c 2007-01-07 17:40:24 UTC (rev 246)
@@ -225,7 +225,6 @@
static result_t pmp_is_supported_codec(pmp_t* pmp, uint32_t codec);
static result_t pmp_is_supported_ext(pmp_t* pmp, const ucs2char_t* filename);
-static uint32_t pmpdb_add_ref(pmp_music_t* pmpdb);
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);
@@ -488,8 +487,6 @@
return PMPDBE_OUTOFMEMORY;
}
- pmpdb->add_ref = pmpdb_add_ref;
- pmpdb->release = pmpdb_release;
pmpdb->set = pmpdb_set;
pmpdb->get = pmpdb_get;
pmpdb->dump = pmpdb_dump;
@@ -503,7 +500,6 @@
pmpdb->pmp = pmp;
pmpdb->instance = pmpdbi;
- pmpdb->add_ref(pmpdb);
*ptr_pmpdb = pmpdb;
return 0;
}
@@ -546,21 +542,13 @@
-static uint32_t pmpdb_add_ref(pmp_music_t* pmpdb)
-{
- return interlocked_increment(&pmpdb->ref_count);
-}
-
static uint32_t pmpdb_release(pmp_music_t* pmpdb)
{
- uint32_t count = interlocked_decrement(&pmpdb->ref_count);
- if (count == 0) {
- pmpdb_internal_t* pmpdbi = (pmpdb_internal_t*)pmpdb->instance;
- pp1db_finish(&pmpdbi->pp1db);
- free(pmpdb->instance);
- free(pmpdb);
- }
- return count;
+ pmpdb_internal_t* pmpdbi = (pmpdb_internal_t*)pmpdb->instance;
+ pp1db_finish(&pmpdbi->pp1db);
+ free(pmpdb->instance);
+ free(pmpdb);
+ return 0;
}
static result_t pmpdb_read(pmp_music_t* pmpdb)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
