[Pmplib-commits] SF.net SVN: pmplib: [266] trunk/pmplib

[<ny...@us...>]

Revision: 266
          http://svn.sourceforge.net/pmplib/?rev=266&view=rev
Author:   nyaochi
Date:     2007-01-17 09:44:42 -0800 (Wed, 17 Jan 2007)

Log Message:
-----------
Incremental commit before fixing a bug.

Modified Paths:
--------------
    trunk/pmplib/frontend/easypmp/common/database.c
    trunk/pmplib/include/pmp.h

Modified: trunk/pmplib/frontend/easypmp/common/database.c
===================================================================
--- trunk/pmplib/frontend/easypmp/common/database.c	2007-01-17 16:31:59 UTC (rev 265)
+++ trunk/pmplib/frontend/easypmp/common/database.c	2007-01-17 17:44:42 UTC (rev 266)
@@ -300,11 +300,11 @@
 
 int database_dump(pmp_t* pmp, FILE *fp, int level)
 {
-	pmp_music_t* pmpdb = pmp->music;
-	if (!pmpdb) {
+	pmp_music_t* music = pmp->music;
+	if (!music) {
 		return 1;
 	}
-	pmpdb->dump(pmpdb, fp, level);
+	music->dump(music, fp, level);
 	return 0;
 }
 

Modified: trunk/pmplib/include/pmp.h
===================================================================
--- trunk/pmplib/include/pmp.h	2007-01-17 16:31:59 UTC (rev 265)
+++ trunk/pmplib/include/pmp.h	2007-01-17 17:44:42 UTC (rev 266)
@@ -115,7 +115,6 @@
 #define	PMPCODEC_WAV			PMPFOURCC('W','A','V','E')	/**< Microsoft Riff WAVE */
 
 #define	PMPMAXCODECS	32
-#define	PMPMAXEXT		8
 
 enum {
 	PMPPEF_NONE =		0x0000,
@@ -318,9 +317,10 @@
 	void* instance;
 	pmp_t* pmp;
 
-	result_t (*set_records)(pmp_music_t* pmpdb, const pmp_music_record_t* records, uint32_t num_records);
-	result_t (*get_records)(pmp_music_t* pmpdb, pmp_music_record_t* records, uint32_t* num_records);
-	result_t (*set_playlists)(pmp_music_t* pmpdb, const pmp_playlist_t* playlists, uint32_t num_playlists);
+	result_t (*set_records)(pmp_music_t* music, const pmp_music_record_t* records, uint32_t num_records);
+	result_t (*get_records)(pmp_music_t* music, pmp_music_record_t* records, uint32_t* num_records);
+	result_t (*set_playlists)(pmp_music_t* music, const pmp_playlist_t* playlists, uint32_t num_playlists);
+	result_t (*get_playlists)(pmp_music_t* music, pmp_playlist_t* playlists, uint32_t* num_playlists);
 
 	result_t (*dump)(pmp_music_t* pmpdb, FILE *fp, int level);
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.