pmplib-commits — SVN commits

[Pmplib-commits] SF.net SVN: pmplib: [51] trunk/frontend/easypmp/cui/easypmp.1

[<suc...@us...>]

Revision: 51
Author:   sucknblow
Date:     2006-06-05 17:35:56 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=51&view=rev

Log Message:
-----------
It's a start of a man page.  Not much to see.

Added Paths:
-----------
    trunk/frontend/easypmp/cui/easypmp.1
Added: trunk/frontend/easypmp/cui/easypmp.1
===================================================================
--- trunk/frontend/easypmp/cui/easypmp.1	                        (rev 0)
+++ trunk/frontend/easypmp/cui/easypmp.1	2006-06-06 00:35:56 UTC (rev 51)
@@ -0,0 +1,79 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.TH EASYPMP 1 "June  2, 2006"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+easypmp \- create music databases used by portable media players
+.SH SYNOPSIS
+.B easypmp
+.R [
+.B -D 
+.R |
+.B -u 
+.RI "] [" mount-point ]
+.SH DESCRIPTION
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+
+\fBeasypmp\fP is a command line utility used to create and maintain the
+music database on a variety of portable music players.
+
+Many Portable music players allow the user to browse tracks by artist,
+album, genre, pre-defined playlists etc.  In order to do this
+efficiently, they require a database of track information.  Without
+this database, the player may require the user to browse tracks using
+only the directory structure.  \fBeasypmp\fP exists to create that
+database, based on the tracks and playlists that are stored on the
+player.
+
+.\".SH OPTIONS"
+.\"These programs follow the usual GNU command line syntax, with long"
+.\"options starting with two dashes (`-')."
+.\"A summary of options is included below."
+.\".TP"
+.\".B \-h, \-\-help"
+.\"Show summary of options."
+.\".TP"
+.\".B \-V, \-\-version"
+.\"Show version of program."
+.SH EXAMPLES
+These examples assume a media player has been mounted as a normal USB
+disk using /media/sda as a mount point.
+
+Firstly, it is advisable to check that \fBeasypmp\fP can support your
+media player:
+
+.B easypmp /media/sda
+
+If \fBeasypmp\fP supports your device, this will show the paths where
+music and playlists should be copied to, prior to creating the
+database.  Once music and playlists have been copied into these
+directories, the music database can be constructed as follows:
+
+.B easypmp -D /media/sda
+
+Note that, if the current directory is the mount point.  it is not
+necessary to specify this on the command line.  Therefore, when
+running \fBeasypmp\fP several times, it is useful to change to the
+mount point directory first, in order to avoid having to specify it
+repeatedly.
+
+.br
+.SH AUTHOR
+\fBeasypmp\fP was written by Nyaochi <nyaochi@ny...@sa...>. who
+also wrote an initial POSIX port using the Cygwin environment.
+
+This manual page was written by Martin Ellis
+<mar...@kd...>, who also updated the POSIX port to improve
+portability.


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

[Pmplib-commits] SF.net SVN: pmplib: [44] trunk/frontend/easypmp/cui

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

Revision: 44
Author:   nyaochi
Date:     2006-06-03 22:18:21 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=44&view=rev

Log Message:
-----------
Added a new option (--strip-words, -t) to configure a list of words to be stripped from artist names.

Modified Paths:
--------------
    trunk/frontend/easypmp/common/database.c
    trunk/frontend/easypmp/common/easypmp.h
    trunk/frontend/easypmp/cui/option.c
Modified: trunk/frontend/easypmp/common/database.c
===================================================================
--- trunk/frontend/easypmp/common/database.c	2006-06-04 04:34:08 UTC (rev 43)
+++ trunk/frontend/easypmp/common/database.c	2006-06-04 05:18:21 UTC (rev 44)
@@ -378,3 +378,62 @@
 	pmpdb->release(pmpdb);
 	return 0;
 }
+
+
+
+int easypmp_set_strip_words(option_t* opt, const ucs2char_t* str)
+{
+	size_t i;
+	const ucs2char_t *p = 0, *q = 0;
+
+	/*
+	 * This function parses a list of strip words specified by comma separated
+	 * values (CSV) and stores them into the option_t instance. Escape by quatation
+	 * mark, eg., "word, " is not allowed at this moment.
+	 */
+
+	/* Free buffers allocated already. */
+	for (i = 0;i < opt->num_strip_words;++i) {
+		ucs2free(opt->strip_words[i]);
+	}
+	ucs2free(opt->strip_words);
+
+	if (str && *str) {
+		/* Count the number of strip words in str. */
+		opt->num_strip_words = 1;
+		for (p = str;*p;++p) {
+			if (*p == ',') {
+				opt->num_strip_words++;
+			}
+		}
+
+		/* Allocate an array to store strip words. */
+		opt->strip_words = (ucs2char_t**)ucs2malloc(sizeof(ucs2char_t*) * opt->num_strip_words);
+		if (!opt->strip_words) {
+			return -1;
+		}
+
+		/* Parse the list of strip words. */
+		p = q = str;
+		for (i = 0;i < opt->num_strip_words;++i) {
+			opt->strip_words[i] = 0;
+			for (;;) {
+				if (*q == ',' || !*q) {
+					size_t length = (size_t)(q - p);
+					opt->strip_words[i] = (ucs2char_t*)ucs2malloc(sizeof(ucs2char_t) * (length+1));
+					memset(opt->strip_words[i], 0, sizeof(ucs2char_t) * (length+1));
+					ucs2ncpy(opt->strip_words[i], p, length);
+					opt->strip_words[i][length] = 0;
+					if (!*q) {
+						break;
+					} else {
+						p = q+1;
+					}
+				}
+				q++;
+			}
+		}
+	}
+	return 0;
+}
+

Modified: trunk/frontend/easypmp/common/easypmp.h
===================================================================
--- trunk/frontend/easypmp/common/easypmp.h	2006-06-04 04:34:08 UTC (rev 43)
+++ trunk/frontend/easypmp/common/easypmp.h	2006-06-04 05:18:21 UTC (rev 44)
@@ -153,6 +153,12 @@
 );
 
 int
+easypmp_set_strip_words(
+	option_t* opt,
+	const ucs2char_t* str
+	);
+
+int
 easypmp_playlist(
 	const easypmp_filelist_t* playlists,
 	const easypmp_filelist_t* musics,

Modified: trunk/frontend/easypmp/cui/option.c
===================================================================
--- trunk/frontend/easypmp/cui/option.c	2006-06-04 04:34:08 UTC (rev 43)
+++ trunk/frontend/easypmp/cui/option.c	2006-06-04 05:18:21 UTC (rev 44)
@@ -67,6 +67,7 @@
 	fprintf(fp, "  -u, --update          Update the existing media database incrementally\n");
 	fprintf(fp, "  -R, --repr            Output a database structure in plain text\n");
 	fprintf(fp, "  -l, --repr-level=VAL  Specify representation level\n");
+	fprintf(fp, "  -t, --strip-words=VAL Specify a list (CSV) of words to strip from artist names\n");
 	fprintf(fp, "\n");
 	fprintf(fp, "Playlist options:\n");
 	fprintf(fp, "  -P, --playlist        Convert playlist files in PLAYLIST directory\n");
@@ -93,42 +94,8 @@
 
 static void set_strip_words(option_t* opt, const char *str)
 {
-	size_t i;
-	const char *p = 0, *q = 0;
-
-	for (i = 0;i < opt->num_strip_words;++i) {
-		ucs2free(opt->strip_words[i]);
-	}
-	ucs2free(opt->strip_words);
-
-	if (str && *str) {
-		opt->num_strip_words = 1;
-		for (p = str;*p;++p) {
-			if (*p == ',') {
-				opt->num_strip_words++;
-			}
-		}
-
-		p = q = str;
-		opt->strip_words = (ucs2char_t**)ucs2malloc(sizeof(ucs2char_t*) * opt->num_strip_words);
-		for (i = 0;i < opt->num_strip_words;++i) {
-			opt->strip_words[i] = 0;
-			for (;;) {
-				if (*q == ',' || !*q) {
-					size_t length = mbstoucs2(0, 0, p, q-p);
-					opt->strip_words[i] = ucs2malloc(sizeof(ucs2char_t*) * length + 1);
-					mbstoucs2(opt->strip_words[i], length, p, q-p);
-					opt->strip_words[i][length] = 0;
-					if (!*q) {
-						break;
-					} else {
-						p = q+1;
-					}
-				}
-				q++;
-			}
-		}
-	}
+	ucs2char_t* ucs2str = mbsdupucs2(str);
+	easypmp_set_strip_words(opt, ucs2str);
 }
 
 int option_parse(option_t* opt, int argc, char *argv[], FILE *fpe)
@@ -150,6 +117,7 @@
 			{"source",			required_argument,	0, 'z'},
 			{"repr",			no_argument,		0, 'R'},
 			{"repr-level",		required_argument,	0, 'l'},
+			{"strip-words",		required_argument,	0, 't'},
 			{"playlist",		no_argument,		0, 'P'},
 			{"music",			no_argument,		0, 'M'},
 			{"reconvert",		no_argument,		0, 'r'},
@@ -167,9 +135,9 @@
 			{NULL, 0, 0, 0}
 		};
 #ifndef	_WIN32
-		int c = getopt_long(argc, argv, "DuzRl:PMrfsjLd:e:w:Vh", long_options, &option_index);
+		int c = getopt_long(argc, argv, "DuzRl:t:PMrfsjLd:e:w:Vh", long_options, &option_index);
 #else
-		int c = getopt_long(argc, argv, "DuzRl:PMrfsjLd:Vh", long_options, &option_index);
+		int c = getopt_long(argc, argv, "DuzRl:t:PMrfsjLd:Vh", long_options, &option_index);
 #endif/*_WIN32*/
 		if (c == -1) {
 			break;
@@ -203,6 +171,9 @@
 		case 'l':
 			opt->repr_level = atoi(optarg);
 			break;
+		case 't':
+			set_strip_words(opt, optarg);
+			break;
 		case 'P':
 			opt->verb |= (MODE_PLAYLIST | MODE_PLAYLIST_PLAYLIST);
 			break;
@@ -227,7 +198,7 @@
 		case 'd':
 			strcpy(opt->model, optarg);
 			break;
-#ifndef		_WIN32
+#ifndef	_WIN32
 		case 'e':
 			opt->system_encoding = optarg;
 			break;


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

[Pmplib-commits] SF.net SVN: pmplib: [47] trunk/debian/easypmp.install

[<suc...@us...>]

Revision: 47
Author:   sucknblow
Date:     2006-06-04 11:36:58 -0700 (Sun, 04 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=47&view=rev

Log Message:
-----------
Plugins are now in $prefix/lib/pmplib.
Include Javascript playlist files in package.

Modified Paths:
--------------
    trunk/debian/easypmp.install
Modified: trunk/debian/easypmp.install
===================================================================
--- trunk/debian/easypmp.install	2006-06-04 05:34:29 UTC (rev 46)
+++ trunk/debian/easypmp.install	2006-06-04 18:36:58 UTC (rev 47)
@@ -3,7 +3,8 @@
 debian/tmp/usr/lib/libgmi.so.*
 debian/tmp/usr/lib/libplaylist.so.*
 debian/tmp/usr/lib/libpmp.so.*
-debian/tmp/usr/lib/pmp/*.so
-debian/tmp/usr/lib/pmp/*.la
+debian/tmp/usr/lib/pmplib/*.so
+debian/tmp/usr/lib/pmplib/*.la
 debian/tmp/usr/bin/easypmp
+debian/tmp/usr/share/pmplib/*
 debian/tmp/usr/share/doc/easypmp/*


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

[Pmplib-commits] SF.net SVN: pmplib: [48] trunk/frontend/easypmp/cui/device.c

[<suc...@us...>]

Revision: 48
Author:   sucknblow
Date:     2006-06-04 16:01:08 -0700 (Sun, 04 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=48&view=rev

Log Message:
-----------
Display paths correctly on posix systems.

Modified Paths:
--------------
    trunk/frontend/easypmp/cui/device.c
Modified: trunk/frontend/easypmp/cui/device.c
===================================================================
--- trunk/frontend/easypmp/cui/device.c	2006-06-04 18:36:58 UTC (rev 47)
+++ trunk/frontend/easypmp/cui/device.c	2006-06-04 23:01:08 UTC (rev 48)
@@ -43,6 +43,16 @@
 	}
 }
 
+// Display a path name using the given string format.
+void device_show_path(FILE *fp, const char const* format, const ucs2char_t const* path)
+{
+	ucs2char_t decoded_path[MAX_PATH];
+	ucs2cpy(decoded_path, path);
+	filepath_decode(decoded_path);
+
+	fprints(fp, format, decoded_path); 
+}
+
 void device_show_information(pmp_t* pmp, FILE *fp)
 {
 	fprintf(fp, "Device identifier: %s\n", pmp->env.id);
@@ -51,8 +61,10 @@
 	fprintf(fp, "  Firmware version: %s\n", pmp->env.version);
 	fprintf(fp, "  Default language: %s\n", pmp->env.language);
 	fprints(fp, "  Root directory: %s\n", pmp->env.path_to_root.path);
-	fprints(fp, "  Music directory: %s\n", pmp->env.path_to_music.path);
-	fprints(fp, "  Playlist directory: %s\n", pmp->env.path_to_playlist.path);
+
+	device_show_path(fp, "  Music directory: %s\n", pmp->env.path_to_music.path);
+	device_show_path(fp, "  Playlist directory: %s\n", pmp->env.path_to_playlist.path);
+
 	fprints(fp, "  Playlist extension: %s\n", pmp->env.playlist_ext);
 }
 


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

[Pmplib-commits] SF.net SVN: pmplib: [45] trunk/frontend/easypmp/win32gui

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

Revision: 45
Author:   nyaochi
Date:     2006-06-03 22:24:20 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=45&view=rev

Log Message:
-----------
[Win32 GUI]
- Added the function to strip words in artist names such as 'the'.

Modified Paths:
--------------
    trunk/frontend/easypmp/win32gui/preference.h
    trunk/frontend/easypmp/win32gui/processingdlg.h
Modified: trunk/frontend/easypmp/win32gui/preference.h
===================================================================
--- trunk/frontend/easypmp/win32gui/preference.h	2006-06-04 05:18:21 UTC (rev 44)
+++ trunk/frontend/easypmp/win32gui/preference.h	2006-06-04 05:24:20 UTC (rev 45)
@@ -28,6 +28,7 @@
 public:
 	int iDBProces;
 	int iMediaInfoSource;
+	CString strStripWords;
 	int iPlaylistProcess;
 	BOOL bConvertInPlaylist;
 	BOOL bConvertInMusic;
@@ -46,6 +47,7 @@
 	{
 		iDBProces = 2;
 		iMediaInfoSource = 0;
+		strStripWords = _T("the ");
 		iPlaylistProcess = 2;
 		bConvertInPlaylist = TRUE;
 		bConvertInMusic = TRUE;
@@ -97,6 +99,7 @@
 
 		persistInt(iDBProces, _T("Database"), _T("Process"), szSettingFile, storing);
 		persistInt(iMediaInfoSource, _T("Database"), _T("MediaInfoSource"), szSettingFile, storing);
+		persistString(strStripWords, _T("Database"), _T("StripWords"), szSettingFile, storing);
 		persistInt(iPlaylistProcess, _T("Playlist"), _T("Process"), szSettingFile, storing);
 		persistBool(bConvertInPlaylist, _T("Playlist"), _T("ConvertPlaylist"), szSettingFile, storing);
 		persistBool(bConvertInMusic, _T("Playlist"), _T("ConvertMusic"), szSettingFile, storing);

Modified: trunk/frontend/easypmp/win32gui/processingdlg.h
===================================================================
--- trunk/frontend/easypmp/win32gui/processingdlg.h	2006-06-04 05:18:21 UTC (rev 44)
+++ trunk/frontend/easypmp/win32gui/processingdlg.h	2006-06-04 05:24:20 UTC (rev 45)
@@ -266,6 +266,9 @@
 		// Set source of media information.
 		opt.media_info_source = media_info_sources[m_preference.iMediaInfoSource];
 
+		// Set a list of strip words.
+		easypmp_set_strip_words(&opt, CT2CW(m_preference.strStripWords));
+
 		// Set Playlist conversion options.
 		switch (m_preference.iPlaylistProcess) {
 		case 1: opt.verb |= MODE_PLAYLIST; break;


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

[Pmplib-commits] SF.net SVN: pmplib: [46] trunk/frontend/easypmp/cui/main.c

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

Revision: 46
Author:   nyaochi
Date:     2006-06-03 22:34:29 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=46&view=rev

Log Message:
-----------
Bumped the version number in main.c

Modified Paths:
--------------
    trunk/frontend/easypmp/cui/main.c
Modified: trunk/frontend/easypmp/cui/main.c
===================================================================
--- trunk/frontend/easypmp/cui/main.c	2006-06-04 05:24:20 UTC (rev 45)
+++ trunk/frontend/easypmp/cui/main.c	2006-06-04 05:34:29 UTC (rev 46)
@@ -49,7 +49,7 @@
 #endif
 
 #define	APPLICATION_S	"EasyPMP [CUI]"
-#define	VERSION_S		"0.10 alpha"
+#define	VERSION_S		"0.11 alpha"
 #define	COPYRIGHT_S		"Copyright (c) 2005-2006 Nyaochi"
 
 int database_dump(pmp_t* pmp, FILE *fpo, int level);


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

[Pmplib-commits] SF.net SVN: pmplib: [49] trunk/debian/control

[<suc...@us...>]

Revision: 49
Author:   sucknblow
Date:     2006-06-05 15:35:15 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=49&view=rev

Log Message:
-----------
Update Debian package description

Modified Paths:
--------------
    trunk/debian/control
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-06-04 23:01:08 UTC (rev 48)
+++ trunk/debian/control	2006-06-05 22:35:15 UTC (rev 49)
@@ -3,14 +3,33 @@
 Priority: extra
 Maintainer: Martin Ellis <mar...@kd...>
 Build-Depends: debhelper (>= 4.0.0), libvorbis-dev, libid3tag0-dev, libmozjs-dev
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: easypmp
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: create music databases used by portable media players
- Easypmp is a command line utility used to maintain the music database on
- a variety of portable music players.
+ Easypmp is a command line utility used to create and maintain the music 
+ database on a variety of portable music players.
  .
- Portable music players use that database to allow the user to browse
- tracks stored on the device by artist, album, genre or track title.
+ Many Portable music players allow the user to browse tracks by artist, album,
+ genre, etc.  In order to do this efficiently, they require a database of
+ track information.  Without this database, the user must normally browse
+ tracks using only the directory structure.
+ .
+ Easypmp can create a music database for the following devices:
+ . 
+   *  iRiver H100 series
+   *  iRiver H300 series
+   *  iRiver H10 UMS
+   *  iRiver H10 MTP (with emergency connect mode)
+   *  iRiver H10Jr. UMS
+   *  iRiver U10 UMS
+   *  MEDION MDJuke220
+   *  MEDION MDJuke440
+   *  Samsung YH-820
+ .
+ A typical usage of easypmp is to connect the media player to the computer;
+ mount it as if it were a normal USB disk; remove some music files from the
+ player; copy some new music files to the player, and then running easypmp to
+ update the database, before disconnecting the player.


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

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

[<suc...@us...>]

Revision: 50
Author:   sucknblow
Date:     2006-06-05 15:49:18 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=50&view=rev

Log Message:
-----------
Update changelog

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/debian/changelog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-06-05 22:35:15 UTC (rev 49)
+++ trunk/ChangeLog	2006-06-05 22:49:18 UTC (rev 50)
@@ -3,5 +3,9 @@
 
 		Changes in 0.11
 - POSIX code updated: now works on Linux.
-- Plugins installed into $(libdir)/pmp
-- Debian packaging scripts available.
+- Bug-fix in playlist conversion for iRiver Plus2
+- Strip words in artist names
+- Plugins installed into $(libdir)/pmplib
+- Debian packaging scripts available (although not policy compliant).
+- U10 1.65 supported
+

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-06-05 22:35:15 UTC (rev 49)
+++ trunk/debian/changelog	2006-06-05 22:49:18 UTC (rev 50)
@@ -1,4 +1,4 @@
-pmplib (0.10-1) unstable; urgency=low
+pmplib (0.11-1) unstable; urgency=low
 
   * Initial release Closes: #369975
 


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

[Pmplib-commits] SF.net SVN: pmplib: [42] trunk/frontend/easypmp/win32gui

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

Revision: 42
Author:   nyaochi
Date:     2006-06-03 21:16:24 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=42&view=rev

Log Message:
-----------
Fixed broken EasyPMP [Win32 GUI] since rev 16.

ViewCVS Links:
-------------
    http://svn.sourceforge.net/pmplib/?rev=16&view=rev

Modified Paths:
--------------
    trunk/frontend/easypmp/win32gui/preference.h
    trunk/frontend/easypmp/win32gui/processingdlg.h
Modified: trunk/frontend/easypmp/win32gui/preference.h
===================================================================
--- trunk/frontend/easypmp/win32gui/preference.h	2006-06-04 04:04:35 UTC (rev 41)
+++ trunk/frontend/easypmp/win32gui/preference.h	2006-06-04 04:16:24 UTC (rev 42)
@@ -192,7 +192,7 @@
 		USES_CONVERSION;
 
 		if (pmp) {
-			strPlayerLocation = W2CT(pmp->env.path_to_root);
+			strPlayerLocation = W2CT(pmp->env.path_to_root.path);
 			strPlayerIdentifier = A2CT(pmp->env.id);
 			strPlayerDescription = A2CT(pmp->env.name);
 			strPlayerDescription += _T("");

Modified: trunk/frontend/easypmp/win32gui/processingdlg.h
===================================================================
--- trunk/frontend/easypmp/win32gui/processingdlg.h	2006-06-04 04:04:35 UTC (rev 41)
+++ trunk/frontend/easypmp/win32gui/processingdlg.h	2006-06-04 04:16:24 UTC (rev 42)
@@ -390,12 +390,12 @@
 		/* Eject the device. */
 		m_preference.bSafelyRemove = IsDlgButtonChecked(IDC_CHECK_SAFEREMOVE) == BST_CHECKED ? TRUE : FALSE;
 		if (m_preference.bSafelyRemove) {
-			if (ucs2len(pmp->env.path_to_root) > 2 && pmp->env.path_to_root[1] == ':') {
+			if (ucs2len(pmp->env.path_to_root.path) > 2 && pmp->env.path_to_root.path[1] == ':') {
 				int i;
 				const int max_tries = 20;
 				CHAR szDrive[3] = {0, 0, 0};
-				szDrive[0] = (CHAR)pmp->env.path_to_root[0];
-				szDrive[1] = (CHAR)pmp->env.path_to_root[1];
+				szDrive[0] = (CHAR)pmp->env.path_to_root.path[0];
+				szDrive[1] = (CHAR)pmp->env.path_to_root.path[1];
 				szDrive[2] = 0;
 
 				ejectdevice_t* ed = ejectdevice_init();
@@ -666,9 +666,9 @@
 		write_log(LL_TRACE, _T("Firmware mode: %s"), A2CT(pmp->env.mode));
 		write_log(LL_INFO, _T("Firmware version: %s"), A2CT(pmp->env.version));
 		write_log(LL_TRACE, _T("Default language: %s"), A2CT(pmp->env.language));
-		write_log(LL_TRACE, _T("Root directory: %s"), W2CT(pmp->env.path_to_root));
-		write_log(LL_TRACE, _T("Music directory: %s"), W2CT(pmp->env.path_to_music));
-		write_log(LL_TRACE, _T("Playlist directory: %s"), W2CT(pmp->env.path_to_playlist));
+		write_log(LL_TRACE, _T("Root directory: %s"), W2CT(pmp->env.path_to_root.path));
+		write_log(LL_TRACE, _T("Music directory: %s"), W2CT(pmp->env.path_to_music.path));
+		write_log(LL_TRACE, _T("Playlist directory: %s"), W2CT(pmp->env.path_to_playlist.path));
 		write_log(LL_TRACE, _T("Playlist extension: %s"), W2CT(pmp->env.playlist_ext));
 		write_log(LL_INFO, _T(""));
 	}


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

[Pmplib-commits] SF.net SVN: pmplib: [43] trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c

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

Revision: 43
Author:   nyaochi
Date:     2006-06-03 21:34:08 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=43&view=rev

Log Message:
-----------
- Updated for U10 1.65 (KOR).
- Changed U10.sys and H10_Jr.sys to "*.SYS"

Modified Paths:
--------------
    trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c
Modified: trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c
===================================================================
--- trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c	2006-06-04 04:16:24 UTC (rev 42)
+++ trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c	2006-06-04 04:34:08 UTC (rev 43)
@@ -63,14 +63,14 @@
 	{
 		"iriver_h10jr_ums_1.00-1.61", "H10Jr UMS", "UM",
 		"1.00", "1.61",
-		"System\\H10_Jr.sys", "System\\H10_Jr.dat", "System\\H10_Jr.idx",
+		"System\\H10_Jr.SYS", "System\\H10_Jr.DAT", "System\\H10_Jr.IDX",
 		"Music\\", "Playlists\\",
 		".plp",
 	},
 	{
-		"iriver_u10_ums_1.00-1.64", "U10 UMS", "UM",
-		"1.00", "1.64",
-		"System\\U10.sys", "System\\U10.dat", "System\\U10.idx",
+		"iriver_u10_ums_1.00-1.65", "U10 UMS", "UM",
+		"1.00", "1.65",
+		"System\\U10.SYS", "System\\U10.dat", "System\\U10.idx",
 		"Music\\", "Playlists\\",
 		".plp",
 	},


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

[Pmplib-commits] SF.net SVN: pmplib: [41] trunk/lib/pmp

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

Revision: 41
Author:   nyaochi
Date:     2006-06-03 21:04:35 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=41&view=rev

Log Message:
-----------
Changed "$PREFIX/*/pmp" to "$PREFIX/*/pmplib" before they propagate.
IMHO, the project name is more appropriate for the location.

Modified Paths:
--------------
    trunk/frontend/easypmp/cui/Makefile.am
    trunk/lib/playlist/Makefile.am
    trunk/lib/pmp/Makefile.am
    trunk/lib/pmp_iriverplus2/Makefile.am
    trunk/lib/pmp_irivnavi/Makefile.am
    trunk/lib/pmp_portalplayer1/Makefile.am
Modified: trunk/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/frontend/easypmp/cui/Makefile.am	2006-06-04 03:54:19 UTC (rev 40)
+++ trunk/frontend/easypmp/cui/Makefile.am	2006-06-04 04:04:35 UTC (rev 41)
@@ -23,7 +23,7 @@
 INCLUDES = @INCLUDES@
 AM_LDFLAGS = @LDFLAGS@
 
-easypmp_CFLAGS = -DPMP_JSPL_DIR="\"$(prefix)/share/pmp/jspl\""
+easypmp_CFLAGS = -DPMP_JSPL_DIR="\"$(prefix)/share/@PACKAGE@/jspl\""
 
 easypmp_LDADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \

Modified: trunk/lib/playlist/Makefile.am
===================================================================
--- trunk/lib/playlist/Makefile.am	2006-06-04 03:54:19 UTC (rev 40)
+++ trunk/lib/playlist/Makefile.am	2006-06-04 04:04:35 UTC (rev 41)
@@ -1,6 +1,6 @@
 # $Id$
 
-jspldir = $(prefix)/share/pmp/jspl
+jspldir = $(prefix)/share/@PACKAGE@/jspl
 jspl_DATA = \
 	jspl/playlist.js \
 	jspl/artist.jspl \

Modified: trunk/lib/pmp/Makefile.am
===================================================================
--- trunk/lib/pmp/Makefile.am	2006-06-04 03:54:19 UTC (rev 40)
+++ trunk/lib/pmp/Makefile.am	2006-06-04 04:04:35 UTC (rev 41)
@@ -8,7 +8,7 @@
 	pmp.c \
 	pmp_posix.c
 
-libpmp_la_CPPFLAGS = -DPMP_MODULES_DIR="\"$(libdir)/pmp\"" $(LTDLINCL)
+libpmp_la_CPPFLAGS = -DPMP_MODULES_DIR="\"$(libdir)/@PACKAGE@\"" $(LTDLINCL)
 
 libpmp_la_LDFLAGS = \
 	-no-undefined

Modified: trunk/lib/pmp_iriverplus2/Makefile.am
===================================================================
--- trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-04 03:54:19 UTC (rev 40)
+++ trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-04 04:04:35 UTC (rev 41)
@@ -1,6 +1,6 @@
 # $Id$
 
-pmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/@PACKAGE@
 pmp_LTLIBRARIES = iriverplus2.la
 
 iriverplus2_la_SOURCES = \

Modified: trunk/lib/pmp_irivnavi/Makefile.am
===================================================================
--- trunk/lib/pmp_irivnavi/Makefile.am	2006-06-04 03:54:19 UTC (rev 40)
+++ trunk/lib/pmp_irivnavi/Makefile.am	2006-06-04 04:04:35 UTC (rev 41)
@@ -1,6 +1,6 @@
 # $Id$
 
-pmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/@PACKAGE@
 pmp_LTLIBRARIES = irivnavi.la
 
 irivnavi_la_SOURCES = \

Modified: trunk/lib/pmp_portalplayer1/Makefile.am
===================================================================
--- trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-04 03:54:19 UTC (rev 40)
+++ trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-04 04:04:35 UTC (rev 41)
@@ -1,6 +1,6 @@
 # $Id$
 
-pmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/@PACKAGE@
 pmp_LTLIBRARIES = portalplayer1.la
 
 portalplayer1_la_SOURCES = \


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

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

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

Revision: 39
Author:   nyaochi
Date:     2006-06-03 19:27:26 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=39&view=rev

Log Message:
-----------
JSPL files (include library and sample files) are now installed into
"$(PREFIX)/share/pmp/jspl" directory.

Modified Paths:
--------------
    trunk/frontend/easypmp/cui/Makefile.am
    trunk/frontend/easypmp/cui/main.c
    trunk/lib/playlist/Makefile.am
    trunk/lib/pmp/pmp_posix.c
    trunk/m4/smjs.m4
Modified: trunk/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/frontend/easypmp/cui/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
+++ trunk/frontend/easypmp/cui/Makefile.am	2006-06-04 02:27:26 UTC (rev 39)
@@ -22,10 +22,11 @@
 INCLUDES = @INCLUDES@ -I../common
 AM_LDFLAGS = @LDFLAGS@
 
+easypmp_CFLAGS = -DPMP_JSPL_DIR="\"$(prefix)/share/pmp/jspl\""
+
 easypmp_LDADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/gmi/libgmi.la \
 	$(top_builddir)/lib/playlist/libplaylist.la \
 	$(top_builddir)/lib/pmp/libpmp.la
-

Modified: trunk/frontend/easypmp/cui/main.c
===================================================================
--- trunk/frontend/easypmp/cui/main.c	2006-06-04 01:34:08 UTC (rev 38)
+++ trunk/frontend/easypmp/cui/main.c	2006-06-04 02:27:26 UTC (rev 39)
@@ -286,7 +286,7 @@
 		filepath_addslash(opt.path_to_include);
 #else
 		// Obtain JavaScript Playlist directory from PMP_JSPLINCL_DIR
-		mbstoucs2(opt.path_to_include, MAX_PATH, PMP_JSPLINCL_DIR, strlen(PMP_JSPLINCL_DIR)+1);
+		mbstoucs2(opt.path_to_include, MAX_PATH, PMP_JSPL_DIR, strlen(PMP_JSPL_DIR)+1);
 #endif
 	}
 

Modified: trunk/lib/playlist/Makefile.am
===================================================================
--- trunk/lib/playlist/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
+++ trunk/lib/playlist/Makefile.am	2006-06-04 02:27:26 UTC (rev 39)
@@ -1,5 +1,12 @@
 # $Id$
 
+jspldir = $(prefix)/share/pmp/jspl
+jspl_DATA = \
+	jspl/playlist.js \
+	jspl/artist.jspl \
+	jspl/artists.jspl \
+	jspl/top_ranking.jspl
+
 lib_LTLIBRARIES = libplaylist.la
 
 libplaylist_la_SOURCES = \

Modified: trunk/lib/pmp/pmp_posix.c
===================================================================
--- trunk/lib/pmp/pmp_posix.c	2006-06-04 01:34:08 UTC (rev 38)
+++ trunk/lib/pmp/pmp_posix.c	2006-06-04 02:27:26 UTC (rev 39)
@@ -68,7 +68,7 @@
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
 		pmphelp->plugins[pmphelp->num_plugins-1] = inst;
 	} else {
-		fprintf(stderr, "FAILED: pmp_portalplayer1 in %s\n", PMP_MODULES_DIR);
+		fprintf(stderr, "FAILED: portalplayer1 in %s\n", PMP_MODULES_DIR);
 	}
 
 	inst = lt_dlopenext("iriverplus2");
@@ -77,7 +77,7 @@
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
 		pmphelp->plugins[pmphelp->num_plugins-1] = inst;
 	} else {
-		fprintf(stderr, "FAILED: pmp_iriverplus2\n");
+		fprintf(stderr, "FAILED: iriverplus2\n");
 	}
 
 	inst = lt_dlopenext("irivnavi");
@@ -86,7 +86,7 @@
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
 		pmphelp->plugins[pmphelp->num_plugins-1] = inst;
 	} else {
-		fprintf(stderr, "FAILED: pmp_irivnavi\n");
+		fprintf(stderr, "FAILED: irivnavi\n");
 	}
 
 	*ptr_pmphelp = pmphelp;

Modified: trunk/m4/smjs.m4
===================================================================
--- trunk/m4/smjs.m4	2006-06-04 01:34:08 UTC (rev 38)
+++ trunk/m4/smjs.m4	2006-06-04 02:27:26 UTC (rev 39)
@@ -28,7 +28,7 @@
 
 m4_define([spidermonkey_locate],
     [AC_CHECK_HEADER([$1jsapi.h],
-	[JS_CFLAGS="-I`spidermonkey_locate_header([$1], [jsapi.h])`"
+	[JS_CFLAGS="-DXP_UNIX -I`spidermonkey_locate_header([$1], [jsapi.h])`"
 	 JS_LIBS="`spidermonkey_locate_lib([$2])`"
 	],
 	[unset JS_CFLAGS JS_LIBS],


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

Re: [Pmplib-commits] SF.net SVN: pmplib: [35] trunk/lib/playlist

[Martin E. <ma...@el...>]

On Sunday 04 June 2006 02:06, ny...@us... wrote:
> Log Message:
> -----------
> - Fixed Win32 build
> - A symbol indicating the build environment must be defined before
> '#include <jsapi.h>'

Hmm.   What should be defined when building on Cygwin?
XP_WIN or XP_UNIX?

I'm not sure how we could do XP_WIN....

Martin

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

[<suc...@us...>]

Revision: 38
Author:   sucknblow
Date:     2006-06-03 18:34:08 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=38&view=rev

Log Message:
-----------
Remove unused NEWS file.

Add enough EXTRA_DISTs in order that a release tarball
can be produced using "make dist-bzip2".

Have I included enough that this works on Cygwin too?

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/frontend/easypmp/cui/Makefile.am
    trunk/lib/gmi/Makefile.am
    trunk/lib/playlist/Makefile.am
    trunk/lib/pmp/Makefile.am

Removed Paths:
-------------
    trunk/NEWS
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-06-04 01:30:52 UTC (rev 37)
+++ trunk/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
@@ -3,8 +3,11 @@
 SUBDIRS = m4 libltdl lib/ucs2 lib/filepath lib/gmi lib/playlist lib/pmp lib/pmp_irivnavi lib/pmp_portalplayer1 lib/pmp_iriverplus2 frontend/easypmp/cui
 
 docdir = $(prefix)/share/doc/@PACKAGE@
-doc_DATA = README NEWS INSTALL COPYING AUTHORS ChangeLog
+doc_DATA = README INSTALL COPYING AUTHORS ChangeLog
 
-EXTRA_DIST = autogen.sh
+EXTRA_DIST = \
+  autogen.sh \
+  include/os.h
 
+AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4

Deleted: trunk/NEWS
===================================================================

Modified: trunk/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/frontend/easypmp/cui/Makefile.am	2006-06-04 01:30:52 UTC (rev 37)
+++ trunk/frontend/easypmp/cui/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
@@ -12,6 +12,7 @@
 	device.c \
 	option.c \
 	option.h \
+	getopt.h \
 	util.c \
 	util.h \
 	main.c

Modified: trunk/lib/gmi/Makefile.am
===================================================================
--- trunk/lib/gmi/Makefile.am	2006-06-04 01:30:52 UTC (rev 37)
+++ trunk/lib/gmi/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
@@ -16,5 +16,7 @@
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	-no-undefined
 
+EXTRA_DIST = contrib
+
 AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@

Modified: trunk/lib/playlist/Makefile.am
===================================================================
--- trunk/lib/playlist/Makefile.am	2006-06-04 01:30:52 UTC (rev 37)
+++ trunk/lib/playlist/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
@@ -19,5 +19,11 @@
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(JS_LIBS)
 
+EXTRA_DIST = \
+  sample/artist.jspl \
+  sample/artists.jspl \
+  sample/top_ranking.jspl \
+  contrib
+
 AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@

Modified: trunk/lib/pmp/Makefile.am
===================================================================
--- trunk/lib/pmp/Makefile.am	2006-06-04 01:30:52 UTC (rev 37)
+++ trunk/lib/pmp/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
@@ -18,5 +18,7 @@
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(LIBLTDL)
 
+EXTRA_DIST = pmp_plugin.sym
+
 AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@


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

[Pmplib-commits] SF.net SVN: pmplib: [37] trunk/lib/playlist

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

Revision: 37
Author:   nyaochi
Date:     2006-06-03 18:30:52 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=37&view=rev

Log Message:
-----------
- Changed "lib/playlist/sample" folder to "lib/playlist/jspl".
- Added "playlist.js" to the folder.

Added Paths:
-----------
    trunk/lib/playlist/jspl/
    trunk/lib/playlist/jspl/playlist.js

Removed Paths:
-------------
    trunk/lib/playlist/sample/
Copied: trunk/lib/playlist/jspl (from rev 34, trunk/lib/playlist/sample)

Added: trunk/lib/playlist/jspl/playlist.js
===================================================================
--- trunk/lib/playlist/jspl/playlist.js	                        (rev 0)
+++ trunk/lib/playlist/jspl/playlist.js	2006-06-04 01:30:52 UTC (rev 37)
@@ -0,0 +1,68 @@
+/**
+ * Playlist class object.
+ */
+Playlist.prototype = new Array();
+
+function Playlist() {
+	/**
+	 * Order tracks in an arbitrary order specified by the arguments.
+	 *	This method sorts tracks in an arbitrary order by comparing field(s) in
+	 *	
+	 *	@param	[arguments]		Field name(s) used for sorting tracks.
+	 */
+	this.order = function()
+	{
+		// Extract field names for the comparison from the arguments.
+		var fields = arguments;
+
+		// Sort the elements by using an anonymous function for the comparison.
+		return this.sort(
+			function(x, y) {
+				var ret = 0;				// Comparison result.
+				// Loop over field names.
+				for (var i = 0;i < fields.length;++i) {
+					var coeff = 1;			// Sorting direction.
+					var field = fields[i];	// Field name for sorting.
+					if (field[0] == '-') {
+						coeff = -1;
+						field = field.slice(1);
+					} else {
+						coeff = +1;
+					}
+
+					// Compare field values of two objects, x and y.
+					ret = ((x[field])>(y[field]))-((x[field])<(y[field]));
+					// Inverse the result when descending sort.
+					ret *= coeff;
+
+					// Exit if the two values are not identical.
+					if (ret != 0) {
+						break;
+					}
+				}
+				// Return the comparison result.
+				return ret;
+			}
+		);
+	};
+
+	this.shuffle = function()
+	{
+		// Assign a random number for each track.
+		for (var i = 0;i < this.length;++i) {
+			this[i].order = Math.random();
+		}
+
+		// Arrange the tracks in a numerical order of the assigned numbers.
+		this.sort(
+			function(x, y) {
+				return ((x.order)>(y.order))-((x.order)<(y.order));
+			}
+		);
+
+		// Remove the assigned number from each track.
+		for (var i = 0;i < this.length;++i) {
+			delete this[i].order;
+		}
+	};
+}


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

[Pmplib-commits] SF.net SVN: pmplib: [36] trunk/frontend/easypmp/cui/main.c

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

Revision: 36
Author:   nyaochi
Date:     2006-06-03 18:25:32 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=36&view=rev

Log Message:
-----------
Preparation for 'include' support in JSPL.

Modified Paths:
--------------
    trunk/frontend/easypmp/cui/main.c
Modified: trunk/frontend/easypmp/cui/main.c
===================================================================
--- trunk/frontend/easypmp/cui/main.c	2006-06-04 01:06:17 UTC (rev 35)
+++ trunk/frontend/easypmp/cui/main.c	2006-06-04 01:25:32 UTC (rev 36)
@@ -276,6 +276,7 @@
 	// Generate the path_to_include
 	if (!opt.path_to_include[0]) {
 #ifdef	_WIN32
+		// "jspl" folder under the location where the executable is installed.
 		ucs2char_t ucs2cs_jspl[] = {'j','s','p','l',0};
 
 		GetModuleFileNameW(GetModuleHandle(NULL), opt.path_to_include, MAX_PATH);
@@ -283,6 +284,9 @@
 		filepath_addslash(opt.path_to_include);
 		ucs2cat(opt.path_to_include, ucs2cs_jspl);
 		filepath_addslash(opt.path_to_include);
+#else
+		// Obtain JavaScript Playlist directory from PMP_JSPLINCL_DIR
+		mbstoucs2(opt.path_to_include, MAX_PATH, PMP_JSPLINCL_DIR, strlen(PMP_JSPLINCL_DIR)+1);
 #endif
 	}
 


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

[Pmplib-commits] SF.net SVN: pmplib: [35] trunk/lib/playlist

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

Revision: 35
Author:   nyaochi
Date:     2006-06-03 18:06:17 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=35&view=rev

Log Message:
-----------
- Fixed Win32 build
- A symbol indicating the build environment must be defined before '#include <jsapi.h>'

Modified Paths:
--------------
    trunk/lib/playlist/jspl.c
    trunk/lib/playlist/playlist.vcproj
Modified: trunk/lib/playlist/jspl.c
===================================================================
--- trunk/lib/playlist/jspl.c	2006-06-03 23:57:29 UTC (rev 34)
+++ trunk/lib/playlist/jspl.c	2006-06-04 01:06:17 UTC (rev 35)
@@ -37,17 +37,7 @@
 #include <pmp.h>
 #include <playlist.h>
 
-#ifdef USE_INTERNAL_SMJS
-// Build against the in-tree copy of SMJS on Windows.
-#define	XP_WIN
-#include <js/jsapi.h>
-#else
-/* Build against external Javascript library headers.
-   XP_UNIX is already defined if we found them by pkgconfig, 
-   but #define here just in case we didn't... */
-#define XP_UNIX
 #include <jsapi.h>
-#endif
 
 #define	MAX_SOURCE_DEPTH	64
 

Modified: trunk/lib/playlist/playlist.vcproj
===================================================================
--- trunk/lib/playlist/playlist.vcproj	2006-06-03 23:57:29 UTC (rev 34)
+++ trunk/lib/playlist/playlist.vcproj	2006-06-04 01:06:17 UTC (rev 35)
@@ -19,8 +19,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)include,.\contrib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLAYLIST_EXPORTS"
+				AdditionalIncludeDirectories="$(SolutionDir)include,.\contrib\js"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLAYLIST_EXPORTS;XP_WIN"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -69,8 +69,8 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)include,.\contrib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLAYLIST_EXPORTS"
+				AdditionalIncludeDirectories="$(SolutionDir)include,.\contrib\js"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLAYLIST_EXPORTS;XP_WIN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"


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

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

[<suc...@us...>]

Revision: 34
Author:   sucknblow
Date:     2006-06-03 16:57:29 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=34&view=rev

Log Message:
-----------
Reduce number of lintian packaging warnings (two left)

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/debian/changelog
    trunk/debian/rules

Removed Paths:
-------------
    trunk/debian/README.Debian
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-06-03 22:25:38 UTC (rev 33)
+++ trunk/ChangeLog	2006-06-03 23:57:29 UTC (rev 34)
@@ -0,0 +1,7 @@
+
+                ChangeLog file for pmplib
+
+		Changes in 0.11
+- POSIX code updated: now works on Linux.
+- Plugins installed into $(libdir)/pmp
+- Debian packaging scripts available.

Deleted: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian	2006-06-03 22:25:38 UTC (rev 33)
+++ trunk/debian/README.Debian	2006-06-03 23:57:29 UTC (rev 34)
@@ -1,6 +0,0 @@
-easypmp for Debian
-------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Martin Ellis <mar...@kd...>, Fri,  2 Jun 2006 18:43:00 +0100

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-06-03 22:25:38 UTC (rev 33)
+++ trunk/debian/changelog	2006-06-03 23:57:29 UTC (rev 34)
@@ -1,6 +1,6 @@
 pmplib (0.10-1) unstable; urgency=low
 
-  * Initial release Closes: #nnnn  (nnnn is the bug number of your ITP)
+  * Initial release Closes: #369975
 
  -- Martin Ellis <mar...@kd...>  Fri,  2 Jun 2006 18:43:00 +0100
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-06-03 22:25:38 UTC (rev 33)
+++ trunk/debian/rules	2006-06-03 23:57:29 UTC (rev 34)
@@ -20,7 +20,7 @@
 
 config.status: configure
 	dh_testdir
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure \
+	LDFLAGS="$(LDFLAGS) -Wl,-z,defs" ./configure \
 	  --host=$(DEB_HOST_GNU_TYPE) \
 	  --build=$(DEB_BUILD_GNU_TYPE) \
 	  --prefix=/usr \


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

[Pmplib-commits] SF.net SVN: pmplib: [33] trunk/lib/pmp

[<suc...@us...>]

Revision: 33
Author:   sucknblow
Date:     2006-06-03 15:25:38 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=33&view=rev

Log Message:
-----------
Revert LDADD->LIBADD thinko.
Install plugins into /usr/lib/pmp again.

Modified Paths:
--------------
    trunk/frontend/easypmp/cui/Makefile.am
    trunk/lib/pmp/pmp_posix.c
    trunk/lib/pmp_iriverplus2/Makefile.am
    trunk/lib/pmp_irivnavi/Makefile.am
    trunk/lib/pmp_portalplayer1/Makefile.am
Modified: trunk/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/frontend/easypmp/cui/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/frontend/easypmp/cui/Makefile.am	2006-06-03 22:25:38 UTC (rev 33)
@@ -21,7 +21,7 @@
 INCLUDES = @INCLUDES@ -I../common
 AM_LDFLAGS = @LDFLAGS@
 
-easypmp_LIBADD = \
+easypmp_LDADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/gmi/libgmi.la \

Modified: trunk/lib/pmp/pmp_posix.c
===================================================================
--- trunk/lib/pmp/pmp_posix.c	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/lib/pmp/pmp_posix.c	2006-06-03 22:25:38 UTC (rev 33)
@@ -62,7 +62,7 @@
 	lt_dlinit();
 	lt_dlsetsearchpath(PMP_MODULES_DIR);
 
-	inst = lt_dlopenext("libpmp_portalplayer1");
+	inst = lt_dlopenext("portalplayer1");
 	if (inst) {
 		pmphelp->num_plugins++;
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
@@ -71,7 +71,7 @@
 		fprintf(stderr, "FAILED: pmp_portalplayer1 in %s\n", PMP_MODULES_DIR);
 	}
 
-	inst = lt_dlopenext("libpmp_iriverplus2");
+	inst = lt_dlopenext("iriverplus2");
 	if (inst) {
 		pmphelp->num_plugins++;
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
@@ -80,7 +80,7 @@
 		fprintf(stderr, "FAILED: pmp_iriverplus2\n");
 	}
 
-	inst = lt_dlopenext("libpmp_irivnavi");
+	inst = lt_dlopenext("irivnavi");
 	if (inst) {
 		pmphelp->num_plugins++;
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);

Modified: trunk/lib/pmp_iriverplus2/Makefile.am
===================================================================
--- trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 22:25:38 UTC (rev 33)
@@ -1,10 +1,9 @@
 # $Id$
 
-libpmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/pmp
+pmp_LTLIBRARIES = iriverplus2.la
 
-lib_LTLIBRARIES = libpmp_iriverplus2.la
-
-libpmp_iriverplus2_la_SOURCES = \
+iriverplus2_la_SOURCES = \
 	../../include/pmp.h \
 	dat.c \
 	idx.c \
@@ -24,11 +23,11 @@
 	util.h \
 	pmp_iriverplus2.c
 
-libpmp_iriverplus2_la_LDFLAGS = \
+iriverplus2_la_LDFLAGS = \
 	-no-undefined  -module -avoid-version \
 	-export-symbols ../pmp/pmp_plugin.sym
 
-libpmp_iriverplus2_la_LIBADD = \
+iriverplus2_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/pmp/libpmp.la

Modified: trunk/lib/pmp_irivnavi/Makefile.am
===================================================================
--- trunk/lib/pmp_irivnavi/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/lib/pmp_irivnavi/Makefile.am	2006-06-03 22:25:38 UTC (rev 33)
@@ -1,10 +1,9 @@
 # $Id$
 
-libpmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/pmp
+pmp_LTLIBRARIES = irivnavi.la
 
-lib_LTLIBRARIES = libpmp_irivnavi.la
-
-libpmp_irivnavi_la_SOURCES = \
+irivnavi_la_SOURCES = \
 	../../include/pmp.h \
 	../../include/pmphelp.h \
 	irivnavi.c \
@@ -14,11 +13,11 @@
 	serialize.h \
 	pmp_irivnavi.c
 
-libpmp_irivnavi_la_LDFLAGS = \
+irivnavi_la_LDFLAGS = \
 	-no-undefined -module -avoid-version \
 	-export-symbols ../pmp/pmp_plugin.sym
 
-libpmp_irivnavi_la_LIBADD = \
+irivnavi_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/pmp/libpmp.la

Modified: trunk/lib/pmp_portalplayer1/Makefile.am
===================================================================
--- trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-03 22:25:38 UTC (rev 33)
@@ -1,10 +1,9 @@
 # $Id$
 
-libpmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/pmp
+pmp_LTLIBRARIES = portalplayer1.la
 
-lib_LTLIBRARIES = libpmp_portalplayer1.la
-
-libpmp_portalplayer1_la_SOURCES = \
+portalplayer1_la_SOURCES = \
 	../../include/pmp.h \
 	hdr.c \
 	hdr_template.c \
@@ -28,11 +27,11 @@
 	model_samsung.c \
 	pmp_portalplayer1.c
 
-libpmp_portalplayer1_la_LDFLAGS = \
+portalplayer1_la_LDFLAGS = \
 	-no-undefined -module -avoid-version \
 	-export-symbols ../pmp/pmp_plugin.sym
 
-libpmp_portalplayer1_la_LIBADD = \
+portalplayer1_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/pmp/libpmp.la


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

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

[<suc...@us...>]

Revision: 32
Author:   sucknblow
Date:     2006-06-03 15:04:42 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=32&view=rev

Log Message:
-----------
Add missing build dependency.  Now builds on Debian sid using
libmozjs-dev (still works using libsmjs-dev on older systems).

Modified Paths:
--------------
    trunk/configure.in
    trunk/debian/control
    trunk/frontend/easypmp/cui/Makefile.am
    trunk/lib/playlist/Makefile.am
    trunk/lib/playlist/jspl.c
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/configure.in	2006-06-03 22:04:42 UTC (rev 32)
@@ -197,6 +197,8 @@
 AC_SUBST(OGG_LIBS)
 AC_SUBST(VORBIS_LIBS)
 AC_SUBST(VORBISFILE_LIBS)
+AC_SUBST(JS_CFLAGS)
+AC_SUBST(JS_LIBS)
 
 
 dnl ------------------------------------------------------------------

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/debian/control	2006-06-03 22:04:42 UTC (rev 32)
@@ -2,7 +2,7 @@
 Section: sound
 Priority: optional
 Maintainer: Martin Ellis <mar...@kd...>
-Build-Depends: debhelper (>= 4.0.0), libid3tag0-dev, libmozjs-dev
+Build-Depends: debhelper (>= 4.0.0), libvorbis-dev, libid3tag0-dev, libmozjs-dev
 Standards-Version: 3.6.2
 
 Package: easypmp

Modified: trunk/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/frontend/easypmp/cui/Makefile.am	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/frontend/easypmp/cui/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
@@ -21,7 +21,7 @@
 INCLUDES = @INCLUDES@ -I../common
 AM_LDFLAGS = @LDFLAGS@
 
-LDADD = \
+easypmp_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/gmi/libgmi.la \

Modified: trunk/lib/playlist/Makefile.am
===================================================================
--- trunk/lib/playlist/Makefile.am	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/lib/playlist/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
@@ -9,14 +9,15 @@
 	playlist.c \
 	jspl.c
 
-libplaylist_la_CPPFLAGS = $(js_inc)
+libplaylist_la_CPPFLAGS = $(JS_CFLAGS)
 
 libplaylist_la_LDFLAGS = \
+	-no-undefined
+
+libplaylist_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
-	-no-undefined
+	$(JS_LIBS)
 
-libplaylist_la_LIBADD = -lsmjs
-
-AM_CFLAGS = @CFLAGS@ $(js_def)
+AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@

Modified: trunk/lib/playlist/jspl.c
===================================================================
--- trunk/lib/playlist/jspl.c	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/lib/playlist/jspl.c	2006-06-03 22:04:42 UTC (rev 32)
@@ -42,9 +42,11 @@
 #define	XP_WIN
 #include <js/jsapi.h>
 #else
-// Build against external SMJS headers.
+/* Build against external Javascript library headers.
+   XP_UNIX is already defined if we found them by pkgconfig, 
+   but #define here just in case we didn't... */
 #define XP_UNIX
-#include <smjs/jsapi.h>
+#include <jsapi.h>
 #endif
 
 #define	MAX_SOURCE_DEPTH	64


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

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

[<suc...@us...>]

Revision: 31
Author:   sucknblow
Date:     2006-06-03 12:41:05 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=31&view=rev

Log Message:
-----------
Add Debian packaging files.
These aren't quite 'lintian' clean, yet.

Names libmozjs-dev as a build dependency - this package
only exists in Debian unstable right now.  For building
packages on older Debian suites, or (K)ubuntu, use
libsmjs-dev instead.

Added Paths:
-----------
    trunk/debian/
    trunk/debian/README.Debian
    trunk/debian/changelog
    trunk/debian/compat
    trunk/debian/control
    trunk/debian/copyright
    trunk/debian/docs
    trunk/debian/easypmp.install
    trunk/debian/postinst
    trunk/debian/postrm
    trunk/debian/preinst
    trunk/debian/prerm
    trunk/debian/rules
Added: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian	                        (rev 0)
+++ trunk/debian/README.Debian	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,6 @@
+easypmp for Debian
+------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Martin Ellis <mar...@kd...>, Fri,  2 Jun 2006 18:43:00 +0100

Added: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	                        (rev 0)
+++ trunk/debian/changelog	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,6 @@
+pmplib (0.10-1) unstable; urgency=low
+
+  * Initial release Closes: #nnnn  (nnnn is the bug number of your ITP)
+
+ -- Martin Ellis <mar...@kd...>  Fri,  2 Jun 2006 18:43:00 +0100
+

Added: trunk/debian/compat
===================================================================
--- trunk/debian/compat	                        (rev 0)
+++ trunk/debian/compat	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1 @@
+4

Added: trunk/debian/control
===================================================================
--- trunk/debian/control	                        (rev 0)
+++ trunk/debian/control	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,16 @@
+Source: pmplib
+Section: sound
+Priority: optional
+Maintainer: Martin Ellis <mar...@kd...>
+Build-Depends: debhelper (>= 4.0.0), libid3tag0-dev, libmozjs-dev
+Standards-Version: 3.6.2
+
+Package: easypmp
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: create music databases used by portable media players
+ Easypmp is a command line utility used to maintain the music database on
+ a variety of portable music players.
+ .
+ Portable music players use that database to allow the user to browse
+ tracks stored on the device by artist, album, genre or track title.

Added: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	                        (rev 0)
+++ trunk/debian/copyright	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,32 @@
+This package was debianized by Martin Ellis <mar...@kd...> on
+Fri,  2 Jun 2006 18:43:00 +0100.
+
+It was downloaded from http://pmplib.sourceforge.net/
+
+The source code is also available from the project Subversion repository:
+https://svn.sourceforge.net/svnroot/pmplib
+
+The upstream maintainer of this package is
+Nyaochi <ny...@ny...>
+
+Copyright:
+
+   Copyright (C) 2006 Nyaochi <ny...@ny...>
+   Copyright (C) 2006 Martin Ellis <mar...@kd...>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems the complete text of the GNU General Public License can
+be found in '/usr/share/common-licenses/GPL'.

Added: trunk/debian/docs
===================================================================
--- trunk/debian/docs	                        (rev 0)
+++ trunk/debian/docs	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1 @@
+README

Added: trunk/debian/easypmp.install
===================================================================
--- trunk/debian/easypmp.install	                        (rev 0)
+++ trunk/debian/easypmp.install	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,9 @@
+debian/tmp/usr/lib/libucs2.so.*
+debian/tmp/usr/lib/libfilepath.so.*
+debian/tmp/usr/lib/libgmi.so.*
+debian/tmp/usr/lib/libplaylist.so.*
+debian/tmp/usr/lib/libpmp.so.*
+debian/tmp/usr/lib/pmp/*.so
+debian/tmp/usr/lib/pmp/*.la
+debian/tmp/usr/bin/easypmp
+debian/tmp/usr/share/doc/easypmp/*

Added: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst	                        (rev 0)
+++ trunk/debian/postinst	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,42 @@
+#! /bin/sh
+# postinst script for easypmp
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+    configure)
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: trunk/debian/postrm
===================================================================
--- trunk/debian/postrm	                        (rev 0)
+++ trunk/debian/postrm	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,38 @@
+#! /bin/sh
+# postrm script for easypmp
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Added: trunk/debian/preinst
===================================================================
--- trunk/debian/preinst	                        (rev 0)
+++ trunk/debian/preinst	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,38 @@
+#! /bin/sh
+# preinst script for easypmp
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: trunk/debian/prerm
===================================================================
--- trunk/debian/prerm	                        (rev 0)
+++ trunk/debian/prerm	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,38 @@
+#! /bin/sh
+# prerm script for easypmp
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: trunk/debian/rules
===================================================================
--- trunk/debian/rules	                        (rev 0)
+++ trunk/debian/rules	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,88 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure \
+	  --host=$(DEB_HOST_GNU_TYPE) \
+	  --build=$(DEB_BUILD_GNU_TYPE) \
+	  --prefix=/usr \
+	  --mandir=\$${prefix}/share/man
+
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+	$(MAKE)
+	#docbook-to-man debian/easypmp.sgml > easypmp.1
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples
+	dh_install
+#	dh_installmenu
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps -ldebian/easypmp/usr/lib
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 


Property changes on: trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *


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

[Pmplib-commits] SF.net SVN: pmplib: [30] trunk/lib/pmp/pmp_posix.c

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

Revision: 30
Author:   nyaochi
Date:     2006-06-03 10:57:18 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=30&view=rev

Log Message:
-----------
Fixed a type difference.

Modified Paths:
--------------
    trunk/lib/pmp/pmp_posix.c
Modified: trunk/lib/pmp/pmp_posix.c
===================================================================
--- trunk/lib/pmp/pmp_posix.c	2006-06-03 17:47:05 UTC (rev 29)
+++ trunk/lib/pmp/pmp_posix.c	2006-06-03 17:57:18 UTC (rev 30)
@@ -37,7 +37,7 @@
 
 typedef struct {
 	uint32_t num_plugins;
-	lt_dlhandle **plugins;
+	lt_dlhandle *plugins;
 } pmphelp_posix_t;
 
 uint32_t interlocked_increment(uint32_t* count)
@@ -65,7 +65,7 @@
 	inst = lt_dlopenext("libpmp_portalplayer1");
 	if (inst) {
 		pmphelp->num_plugins++;
-		pmphelp->plugins = (void**)realloc(pmphelp->plugins, sizeof(void*) * pmphelp->num_plugins);
+		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
 		pmphelp->plugins[pmphelp->num_plugins-1] = inst;
 	} else {
 		fprintf(stderr, "FAILED: pmp_portalplayer1 in %s\n", PMP_MODULES_DIR);
@@ -74,7 +74,7 @@
 	inst = lt_dlopenext("libpmp_iriverplus2");
 	if (inst) {
 		pmphelp->num_plugins++;
-		pmphelp->plugins = (void**)realloc(pmphelp->plugins, sizeof(void*) * pmphelp->num_plugins);
+		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
 		pmphelp->plugins[pmphelp->num_plugins-1] = inst;
 	} else {
 		fprintf(stderr, "FAILED: pmp_iriverplus2\n");
@@ -83,7 +83,7 @@
 	inst = lt_dlopenext("libpmp_irivnavi");
 	if (inst) {
 		pmphelp->num_plugins++;
-		pmphelp->plugins = (void**)realloc(pmphelp->plugins, sizeof(void*) * pmphelp->num_plugins);
+		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
 		pmphelp->plugins[pmphelp->num_plugins-1] = inst;
 	} else {
 		fprintf(stderr, "FAILED: pmp_irivnavi\n");
@@ -99,7 +99,7 @@
 	uint32_t i;
 
 	for (i = 0;i < pmphelpposix->num_plugins;++i) {
-		lt_dlhandle(pmphelpposix->plugins[i]);
+		lt_dlclose(pmphelpposix->plugins[i]);
 	}
 	free(pmphelpposix->plugins);
 	free(pmphelpposix);


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

[Pmplib-commits] SF.net SVN: pmplib: [29] trunk/lib/pmp

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

Revision: 29
Author:   nyaochi
Date:     2006-06-03 10:47:05 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=29&view=rev

Log Message:
-----------
Small fixes from Martin Ellis

Modified Paths:
--------------
    trunk/lib/pmp/pmp_posix.c
    trunk/lib/pmp_iriverplus2/Makefile.am
Modified: trunk/lib/pmp/pmp_posix.c
===================================================================
--- trunk/lib/pmp/pmp_posix.c	2006-06-03 17:37:08 UTC (rev 28)
+++ trunk/lib/pmp/pmp_posix.c	2006-06-03 17:47:05 UTC (rev 29)
@@ -37,7 +37,7 @@
 
 typedef struct {
 	uint32_t num_plugins;
-	void **plugins;
+	lt_dlhandle **plugins;
 } pmphelp_posix_t;
 
 uint32_t interlocked_increment(uint32_t* count)
@@ -99,7 +99,7 @@
 	uint32_t i;
 
 	for (i = 0;i < pmphelpposix->num_plugins;++i) {
-		dlclose(pmphelpposix->plugins[i]);
+		lt_dlhandle(pmphelpposix->plugins[i]);
 	}
 	free(pmphelpposix->plugins);
 	free(pmphelpposix);

Modified: trunk/lib/pmp_iriverplus2/Makefile.am
===================================================================
--- trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
+++ trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 17:47:05 UTC (rev 29)
@@ -25,7 +25,7 @@
 	pmp_iriverplus2.c
 
 libpmp_iriverplus2_la_LDFLAGS = \
-	-no-undefined  -module -avoid-versions \
+	-no-undefined  -module -avoid-version \
 	-export-symbols ../pmp/pmp_plugin.sym
 
 libpmp_iriverplus2_la_LIBADD = \


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

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

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

Revision: 28
Author:   nyaochi
Date:     2006-06-03 10:37:08 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=28&view=rev

Log Message:
-----------
Reduced warnings. Added Makefile.am in m4 directory.

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/configure.in
    trunk/include/gmi.h
    trunk/include/pmp.h
    trunk/lib/pmp/Makefile.am
    trunk/lib/pmp/pmp_posix.c
    trunk/lib/pmp_iriverplus2/Makefile.am
    trunk/lib/pmp_iriverplus2/ip2db_idx.c
    trunk/lib/pmp_irivnavi/Makefile.am
    trunk/lib/pmp_irivnavi/pmp_irivnavi.c
    trunk/lib/pmp_portalplayer1/Makefile.am

Added Paths:
-----------
    trunk/m4/Makefile.am
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
@@ -1,9 +1,7 @@
 # $Id$
 
-SUBDIRS = libltdl lib/ucs2 lib/filepath lib/gmi lib/playlist lib/pmp lib/pmp_irivnavi lib/pmp_portalplayer1 lib/pmp_iriverplus2 frontend/easypmp/cui
+SUBDIRS = m4 libltdl lib/ucs2 lib/filepath lib/gmi lib/playlist lib/pmp lib/pmp_irivnavi lib/pmp_portalplayer1 lib/pmp_iriverplus2 frontend/easypmp/cui
 
-INCLUDES = $(LTDLINCL)
-
 docdir = $(prefix)/share/doc/@PACKAGE@
 doc_DATA = README NEWS INSTALL COPYING AUTHORS ChangeLog
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/configure.in	2006-06-03 17:37:08 UTC (rev 28)
@@ -7,56 +7,70 @@
 dnl INCLUDES
 
 
+dnl ------------------------------------------------------------------
 dnl Initialization for autoconf
+dnl ------------------------------------------------------------------
 AC_PREREQ(2.53)
 AC_INIT
 AC_CONFIG_SRCDIR([frontend/easypmp/cui/main.c])
 
 
+dnl ------------------------------------------------------------------
 dnl Checks for system
+dnl ------------------------------------------------------------------
 AC_CANONICAL_HOST
 AC_AIX
 AC_MINIX
 AC_ISC_POSIX
 
+
+dnl ------------------------------------------------------------------
 dnl Initialization for automake
+dnl ------------------------------------------------------------------
 AM_INIT_AUTOMAKE(pmplib, 0.11)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 AM_C_PROTOTYPES
 
+
+dnl ------------------------------------------------------------------
 dnl Checks for program
+dnl ------------------------------------------------------------------
 AM_PROG_CC_STDC
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
-dnl Initialozation for libtool
+
+dnl ------------------------------------------------------------------
+dnl Checks for libltdl
+dnl ------------------------------------------------------------------
 AC_LIBLTDL_CONVENIENCE
-dnl Substitute LTDLINCL and LIBLTDL in the Makefiles
 AC_SUBST(LTDLINCL)
 AC_SUBST(LIBLTDL)
-dnl Check for dlopen support
 AC_LIBTOOL_DLOPEN
-dnl Configure libtool
 AC_PROG_LIBTOOL
-dnl Configure libltdl
 AC_CONFIG_SUBDIRS(libltdl)
 
+
+dnl ------------------------------------------------------------------
 dnl Initialization for variables
+dnl ------------------------------------------------------------------
 CFLAGS="${ac_save_CFLAGS}"
 LDFLAGS="${ac_save_LDFLAGS}"
 INCLUDES="-I\$(top_srcdir) -I\$(top_srcdir)/include -I\$(srcdir)"
 
-dnl Additional options
 
-
+dnl ------------------------------------------------------------------
 dnl Checks for header files.
+dnl ------------------------------------------------------------------
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h limits.h malloc.h strings.h unistd.h stdint.h getopt.h)
 
 
+dnl ------------------------------------------------------------------
 dnl Checks for typedefs, structures, and compiler characteristics.
+dnl ------------------------------------------------------------------
 AC_C_CONST
 AC_CHECK_SIZEOF
 AC_TYPE_SIZE_T
@@ -106,7 +120,10 @@
 	typedef A_UINT32_T uint32_t;
 #endif])
 
+
+dnl ------------------------------------------------------------------
 dnl Checks for debugging mode
+dnl ------------------------------------------------------------------
 AC_ARG_ENABLE(
   debug,
   [AC_HELP_STRING(--enable-debug, [Turn on debugging])]
@@ -117,7 +134,9 @@
 fi
 
 
+dnl ------------------------------------------------------------------
 dnl Checks for library functions.
+dnl ------------------------------------------------------------------
 AC_FUNC_ALLOCA
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
@@ -127,7 +146,7 @@
 AC_CHECK_LIB(m, rand)
 
 dnl Check for zlib library
-AC_CHECK_LIB(z, uncompress, , [AC_MSG_ERROR(libz not found!)])
+AC_CHECK_LIB(z, uncompress)
 
 dnl Check for iconv library
 AM_ICONV
@@ -163,12 +182,13 @@
 dnl Checks for vorbis
 AM_PATH_VORBIS
 
-dnl ------------------------------------------------------------------
 dnl Check for libsmjs (SpiderMonkey JavaScript engine)
-dnl ------------------------------------------------------------------
 AC_PATH_SPIDERMONKEY
 
+
+dnl ------------------------------------------------------------------
 dnl Export variables
+dnl ------------------------------------------------------------------
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(INCLUDES)
@@ -179,19 +199,8 @@
 AC_SUBST(VORBISFILE_LIBS)
 
 
-dnl Should the in-tree copy of SMJS be used? Only on Windows.
-case "$UNAME_SYSTEM" in
-  CYGWIN*)
-    AM_CONDITIONAL([WIN32], true)
-  ;;
-  MINGW*)
-    AM_CONDITIONAL([WIN32], true)
-  ;;
-  *)
-    AM_CONDITIONAL([WIN32], false)
-  ;;
-esac
-
+dnl ------------------------------------------------------------------
 dnl Output the configure results.
-AC_CONFIG_FILES(Makefile lib/ucs2/Makefile lib/filepath/Makefile lib/gmi/Makefile lib/pmp/Makefile lib/pmp_irivnavi/Makefile lib/pmp_portalplayer1/Makefile lib/pmp_iriverplus2/Makefile lib/playlist/Makefile frontend/easypmp/cui/Makefile)
+dnl ------------------------------------------------------------------
+AC_CONFIG_FILES(Makefile m4/Makefile lib/ucs2/Makefile lib/filepath/Makefile lib/gmi/Makefile lib/pmp/Makefile lib/pmp_irivnavi/Makefile lib/pmp_portalplayer1/Makefile lib/pmp_iriverplus2/Makefile lib/playlist/Makefile frontend/easypmp/cui/Makefile)
 AC_OUTPUT

Modified: trunk/include/gmi.h
===================================================================
--- trunk/include/gmi.h	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/include/gmi.h	2006-06-03 17:37:08 UTC (rev 28)
@@ -57,7 +57,7 @@
 	const ucs2char_t *filename,
 	const ucs2char_t* path_to_music,
 	int flag,
-	const ucs2char_t* strip_words[],
+	const ucs2char_t** strip_words,
 	int num_strip_words
 	);
 

Modified: trunk/include/pmp.h
===================================================================
--- trunk/include/pmp.h	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/include/pmp.h	2006-06-03 17:37:08 UTC (rev 28)
@@ -162,7 +162,7 @@
 	uint32_t (*add_ref)(pmppl_t* pmppl);
 	uint32_t (*release)(pmppl_t* pmppl);
 
-	result_t (*write)(pmppl_t* pmppl, const ucs2char_t* filename, const ucs2char_t* files[], uint32_t num_files);
+	result_t (*write)(pmppl_t* pmppl, const ucs2char_t* filename, const ucs2char_t** files, uint32_t num_files);
 };
 
 typedef result_t (*pmp_create_t)(pmp_t** pmp, const ucs2char_t* path_to_device, const char *devid);

Modified: trunk/lib/pmp/Makefile.am
===================================================================
--- trunk/lib/pmp/Makefile.am	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
@@ -8,7 +8,7 @@
 	pmp.c \
 	pmp_posix.c
 
-libpmp_la_CPPFLAGS = -DPMP_MODULES_DIR="\"$(libdir)/pmp\""
+libpmp_la_CPPFLAGS = -DPMP_MODULES_DIR="\"$(libdir)/pmp\"" $(LTDLINCL)
 
 libpmp_la_LDFLAGS = \
 	-no-undefined

Modified: trunk/lib/pmp/pmp_posix.c
===================================================================
--- trunk/lib/pmp/pmp_posix.c	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp/pmp_posix.c	2006-06-03 17:37:08 UTC (rev 28)
@@ -26,7 +26,7 @@
 #include <config.h>
 #endif/*HAVE_CONFIG_H*/
 
-#include <dlfcn.h>
+#include <ltdl.h>
 
 #include <os.h>
 #include <ucs2char.h>
@@ -52,7 +52,7 @@
 
 result_t pmphelp_init(pmphelp_t** ptr_pmphelp)
 {
-	void *inst = NULL;
+	lt_dlhandle inst = 0;
 	pmphelp_posix_t* pmphelp = NULL;
 
 	pmphelp = (pmphelp_posix_t*)calloc(1, sizeof(pmphelp_posix_t));

Modified: trunk/lib/pmp_iriverplus2/Makefile.am
===================================================================
--- trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
@@ -1,6 +1,7 @@
 # $Id$
 
-pmpdir=$(libdir)/pmp
+libpmpdir=$(libdir)/pmp
+
 lib_LTLIBRARIES = libpmp_iriverplus2.la
 
 libpmp_iriverplus2_la_SOURCES = \

Modified: trunk/lib/pmp_iriverplus2/ip2db_idx.c
===================================================================
--- trunk/lib/pmp_iriverplus2/ip2db_idx.c	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp_iriverplus2/ip2db_idx.c	2006-06-03 17:37:08 UTC (rev 28)
@@ -71,7 +71,12 @@
 			sortitems[i].records = records;
 			sortitems[i].index = i;
 		}
-		qsort(sortitems, num_records, sizeof(sortitem_t), idxexp->comp);
+		qsort(
+			sortitems,
+			num_records,
+			sizeof(sortitem_t),
+			idxexp->comp
+			);
 
 		/* Convert record_t elements into idxkey elements. */
 		for (i = 0;i < num_records;++i) {

Modified: trunk/lib/pmp_irivnavi/Makefile.am
===================================================================
--- trunk/lib/pmp_irivnavi/Makefile.am	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp_irivnavi/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
@@ -1,5 +1,7 @@
 # $Id$
 
+libpmpdir=$(libdir)/pmp
+
 lib_LTLIBRARIES = libpmp_irivnavi.la
 
 libpmp_irivnavi_la_SOURCES = \

Modified: trunk/lib/pmp_irivnavi/pmp_irivnavi.c
===================================================================
--- trunk/lib/pmp_irivnavi/pmp_irivnavi.c	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp_irivnavi/pmp_irivnavi.c	2006-06-03 17:37:08 UTC (rev 28)
@@ -262,7 +262,7 @@
 	*ptr_pmpdb = 0;
 
 	// Allocate a PMPDB instance.
-	pmpdb = calloc(1, sizeof(pmpdb_t));
+	pmpdb = (pmpdb_t*)calloc(1, sizeof(pmpdb_t));
 	if (!pmpdb) {
 		return PMPDBE_OUTOFMEMORY;
 	}
@@ -277,7 +277,7 @@
 	pmpdb->dump = pmpdb_dump;
 
 	// Allocate and initialize an internal object (irivnavi_t).
-	irivnavi = calloc(1, sizeof(irivnavi_t));
+	irivnavi = (irivnavi_t*)calloc(1, sizeof(irivnavi_t));
 	if (!irivnavi) {
 		free(pmpdb);
 		return PMPDBE_OUTOFMEMORY;
@@ -300,7 +300,7 @@
 
 	*ptr_pmppl = 0;
 
-	pmppl = calloc(1, sizeof(pmppl_t));
+	pmppl = (pmppl_t*)calloc(1, sizeof(pmppl_t));
 	if (!pmppl) {
 		return PMPDBE_OUTOFMEMORY;
 	}

Modified: trunk/lib/pmp_portalplayer1/Makefile.am
===================================================================
--- trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
@@ -1,5 +1,7 @@
 # $Id$
 
+libpmpdir=$(libdir)/pmp
+
 lib_LTLIBRARIES = libpmp_portalplayer1.la
 
 libpmp_portalplayer1_la_SOURCES = \

Added: trunk/m4/Makefile.am
===================================================================
--- trunk/m4/Makefile.am	                        (rev 0)
+++ trunk/m4/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
@@ -0,0 +1,7 @@
+# $Id: Makefile.am 20 2006-06-02 18:12:30Z nyaochi $
+
+EXTRA_DIST = \
+	iconv.m4 \
+	ogg.m4 \
+	vorbis.m4 \
+	smjs.m4


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

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

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

Revision: 27
Author:   nyaochi
Date:     2006-06-02 18:16:42 -0700 (Fri, 02 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=27&view=rev

Log Message:
-----------
Added iconv.m4, ogg.m4, vorbis.m4

Modified Paths:
--------------
    trunk/configure.in

Added Paths:
-----------
    trunk/m4/iconv.m4
    trunk/m4/ogg.m4
    trunk/m4/vorbis.m4
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-06-03 00:40:44 UTC (rev 26)
+++ trunk/configure.in	2006-06-03 01:16:42 UTC (rev 27)
@@ -130,76 +130,8 @@
 AC_CHECK_LIB(z, uncompress, , [AC_MSG_ERROR(libz not found!)])
 
 dnl Check for iconv library
-AC_ARG_WITH(
-	iconv-header,
-	[AC_HELP_STRING(--with-iconv-header=DIR, [iconv header directory])],
-	[CFLAGS="-I$withval ${CFLAGS}"]
-)
+AM_ICONV
 
-AC_ARG_WITH(
-	iconv-library,
-	[AC_HELP_STRING(--with-iconv-library=DIR, [iconv library directory])],
-	[LDFLAGS="-L$withval ${LDFLAGS}"; with_libiconv=native],
-	[with_libiconv=maybe]
-)
-
-AC_CHECK_HEADER(iconv.h, , [AC_MSG_ERROR(iconv.h not found!)])
-
-found_iconv=no
-case $with_libiconv in
-  maybe)
-    # Check in the C library first
-    AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes])
-    # Check if we have GNU libiconv
-    if test $found_iconv = "no"; then
-      AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes])
-    fi
-    # Check if we have a iconv in -liconv, possibly from vendor
-    if test $found_iconv = "no"; then
-      AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes])
-    fi
-    ;;
-  no)
-    AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes])
-    ;;
-  gnu|yes)
-    AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes])
-    ;;
-  native)
-    echo "native"
-    echo $LDFLAGS
-    # Check if we have GNU libiconv
-    if test $found_iconv = "no"; then
-      AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes])
-    fi
-    # Check if we have a iconv in -liconv, possibly from vendor
-    if test $found_iconv = "no"; then
-      AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes])
-    fi
-    ;;
-esac
-
-if test "x$found_iconv" = "xno" ; then
-	AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
-fi
-
-if test x$with_libiconv != xno ; then
-	case " $INTLLIBS " in
-	*[[\ \	]]-liconv[[\ \	]]*) ;;
-	*) ICONV_LIBS="-liconv" ;;
-	esac
-fi
-
-case $with_libiconv in
-  gnu)
-    AC_DEFINE(USE_LIBICONV_GNU, 1, [Using GNU libiconv])
-    ;;
-  native)
-    AC_DEFINE(USE_LIBICONV_NATIVE, 1, [Using a native implementation of iconv in a separate library])
-    ;;
-esac
-
-
 dnl Checks for id3tag
 AC_ARG_WITH(
 	id3tag-header,
@@ -226,66 +158,11 @@
 )
 
 dnl Checks for ogg
-AC_ARG_WITH(
-	ogg-header,
-	[AC_HELP_STRING(--with-ogg-header=DIR, [ogg header directory])],
-	[CFLAGS="-I$withval ${CFLAGS}"]
-)
+AM_PATH_OGG
 
-AC_ARG_WITH(
-	ogg-library,
-	[AC_HELP_STRING(--with-ogg-library=DIR, [ogg library directory])],
-	[LDFLAGS="-L$withval ${LDFLAGS}"]
-)
-
-AC_CHECK_HEADER(
-	ogg/ogg.h,
-	,
-	[AC_MSG_ERROR(ogg header not found!)]
-)
-AC_CHECK_LIB(
-  ogg,
-  ogg_stream_init,
-  [OGG_LIBS="-logg"],
-  AC_MSG_ERROR([ogg library is not found!])
-)
-
 dnl Checks for vorbis
-AC_ARG_WITH(
-	vorbis-header,
-	[AC_HELP_STRING(--with-vorbis-header=DIR, [vorbis header directory])],
-	[CFLAGS="-I$withval ${CFLAGS}"]
-)
+AM_PATH_VORBIS
 
-AC_ARG_WITH(
-	vorbis-library,
-	[AC_HELP_STRING(--with-vorbis-library=DIR, [vorbis library directory])],
-	[LDFLAGS="-L$withval ${LDFLAGS}"]
-)
-
-AC_CHECK_HEADER(
-  vorbis/codec.h,
-  ,
-  [AC_MSG_ERROR(vorbis header not found!)]
-)
-AC_CHECK_HEADER(
-  vorbis/vorbisfile.h,
-  ,
-  [AC_MSG_ERROR(vorbisfile header not found!)]
-)
-AC_CHECK_LIB(
-  vorbis,
-  vorbis_synthesis_init,
-  [VORBIS_LIBS="-lvorbis"],
-  AC_MSG_ERROR([vorbis library is not found!])
-)
-AC_CHECK_LIB(
-  vorbisfile,
-  ov_open,
-  [VORBISFILE_LIBS="-lvorbisfile"],
-  AC_MSG_ERROR([vorbisfile library is not found!])
-)
-
 dnl ------------------------------------------------------------------
 dnl Check for libsmjs (SpiderMonkey JavaScript engine)
 dnl ------------------------------------------------------------------

Added: trunk/m4/iconv.m4
===================================================================
--- trunk/m4/iconv.m4	                        (rev 0)
+++ trunk/m4/iconv.m4	2006-06-03 01:16:42 UTC (rev 27)
@@ -0,0 +1,69 @@
+#serial AM2
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  AC_ARG_WITH([libiconv-prefix],
+[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+    done
+   ])
+
+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      am_cv_func_iconv=yes)
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS -liconv"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes)
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL(am_cv_proto_iconv, [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([$]{ac_t:-
+         }[$]am_cv_proto_iconv)
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+  LIBICONV=
+  if test "$am_cv_lib_iconv" = yes; then
+    LIBICONV="-liconv"
+  fi
+  AC_SUBST(LIBICONV)
+])

Added: trunk/m4/ogg.m4
===================================================================
--- trunk/m4/ogg.m4	                        (rev 0)
+++ trunk/m4/ogg.m4	2006-06-03 01:16:42 UTC (rev 27)
@@ -0,0 +1,95 @@
+# Configure paths for libogg
+# Jack Moffitt <ja...@ic...> 10-21-2000
+# Shamelessly stolen from Owen Taylor and Manish Singh
+
+dnl AM_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
+dnl
+AC_DEFUN([AM_PATH_OGG],
+[dnl 
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(ogg-prefix, AC_HELP_STRING([--with-ogg-prefix=DIR], [prefix where libogg is installed (optional)]), ogg_prefix="$withval", ogg_prefix="")
+AC_ARG_ENABLE(oggtest, AC_HELP_STRING([--disable-oggtest], [do not try to compile and run a test Ogg program]), enable_oggtest=$enableval, enable_oggtest=yes)
+
+  if test x$ogg_prefix != x ; then
+    ogg_args="$ogg_args --prefix=$ogg_prefix"
+    OGG_CFLAGS="-I$ogg_prefix/include"
+    OGG_LIBS="-L$ogg_prefix/$XINE_LIBNAME"
+  fi
+
+  OGG_LIBS="$OGG_LIBS -logg"
+
+  AC_MSG_CHECKING(for Ogg)
+  no_ogg=""
+
+
+  if test "x$enable_oggtest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $OGG_CFLAGS"
+    LIBS="$LIBS $OGG_LIBS"
+dnl
+dnl Now check if the installed Ogg is sufficiently new.
+dnl
+      rm -f conf.oggtest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ogg/ogg.h>
+
+int main ()
+{
+  system("touch conf.oggtest");
+  return 0;
+}
+
+],, no_ogg=yes,
+         AC_TRY_LINK([
+#include <stdio.h>
+#include <ogg/ogg.h>
+],       [ return 0; ],, no_ogg=yes))
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_ogg" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])     
+  else
+     AC_MSG_RESULT(no)
+     if test -f conf.oggtest ; then
+       :
+     else
+       echo "*** Could not run Ogg test program, checking why..."
+       CFLAGS="$CFLAGS $OGG_CFLAGS"
+       LIBS="$LIBS $OGG_LIBS"
+       AC_TRY_LINK([
+#include <stdio.h>
+#include <ogg/ogg.h>
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding Ogg or finding the wrong"
+       echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
+       echo "*** or that you have moved Ogg since it was installed. In the latter case, you"
+       echo "*** may want to edit the ogg-config script: $OGG_CONFIG" ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+     OGG_CFLAGS=""
+     OGG_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(OGG_CFLAGS)
+  AC_SUBST(OGG_LIBS)
+  rm -f conf.oggtest
+])

Added: trunk/m4/vorbis.m4
===================================================================
--- trunk/m4/vorbis.m4	                        (rev 0)
+++ trunk/m4/vorbis.m4	2006-06-03 01:16:42 UTC (rev 27)
@@ -0,0 +1,100 @@
+# Configure paths for libvorbis
+# Jack Moffitt <ja...@ic...> 10-21-2000
+# Shamelessly stolen from Owen Taylor and Manish Singh
+
+dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
+dnl
+AC_DEFUN([AM_PATH_VORBIS],
+[dnl 
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(vorbis-prefix, AC_HELP_STRING([--with-vorbis-prefix=DIR], [prefix where libvorbis is installed (optional)]), vorbis_prefix="$withval", vorbis_prefix="")
+AC_ARG_ENABLE(vorbistest, AC_HELP_STRING([--disable-vorbistest], [do not try to compile and run a test Vorbis program]), enable_vorbistest=$enableval, enable_vorbistest=yes)
+
+  if test x$vorbis_prefix != x ; then
+    vorbis_args="$vorbis_args --prefix=$vorbis_prefix"
+    VORBIS_CFLAGS="-I$vorbis_prefix/include"
+    VORBIS_LIBDIR="-L$vorbis_prefix/$XINE_LIBNAME"
+  fi
+
+  VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm"
+  VORBISFILE_LIBS="-lvorbisfile"
+  VORBISENC_LIBS="-lvorbisenc"
+
+  AC_MSG_CHECKING(for Vorbis)
+  no_vorbis=""
+
+
+  if test "x$enable_vorbistest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $VORBIS_CFLAGS"
+    LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
+dnl
+dnl Now check if the installed Vorbis is sufficiently new.
+dnl
+      rm -f conf.vorbistest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vorbis/codec.h>
+
+int main ()
+{
+  system("touch conf.vorbistest");
+  return 0;
+}
+
+],, no_vorbis=yes,
+         AC_TRY_LINK([
+#include <stdio.h>
+#include <vorbis/codec.h>
+],       [ return 0; ],, no_vorbis=yes))
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_vorbis" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])     
+  else
+     AC_MSG_RESULT(no)
+     if test -f conf.vorbistest ; then
+       :
+     else
+       echo "*** Could not run Vorbis test program, checking why..."
+       CFLAGS="$CFLAGS $VORBIS_CFLAGS"
+       LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
+       AC_TRY_LINK([
+#include <stdio.h>
+#include <vorbis/codec.h>
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding Vorbis or finding the wrong"
+       echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occured. This usually means Vorbis was incorrectly installed"
+       echo "*** or that you have moved Vorbis since it was installed." ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+     VORBIS_CFLAGS=""
+     VORBIS_LIBS=""
+     VORBISFILE_LIBS=""
+     VORBISENC_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(VORBIS_CFLAGS)
+  AC_SUBST(VORBIS_LIBS)
+  AC_SUBST(VORBISFILE_LIBS)
+  AC_SUBST(VORBISENC_LIBS)
+  rm -f conf.vorbistest
+])


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