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

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

Revision: 152
Author:   sucknblow
Date:     2006-07-29 14:56:41 -0700 (Sat, 29 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=152&view=rev

Log Message:
-----------
Don't show JSPL options where not supported.
-j/--jspl are still accepted when not supported,
but their use produces a warning.

Modified Paths:
--------------
    trunk/frontend/easypmp/cui/main.c
    trunk/frontend/easypmp/cui/option.c
Modified: trunk/frontend/easypmp/cui/main.c
===================================================================
--- trunk/frontend/easypmp/cui/main.c	2006-07-29 20:54:17 UTC (rev 151)
+++ trunk/frontend/easypmp/cui/main.c	2006-07-29 21:56:41 UTC (rev 152)
@@ -346,9 +346,15 @@
 	if (opt.verb & MODE_PLAYLIST) {
 		// Read the database for JSPL.
 		if ((opt.verb & MODE_PLAYLIST_JSPL) && (!records)) {
+#ifdef HAVE_JSAPI_H
 			easypmp_database_read(pmp, &opt, &records, &num_records, easypmp_progress, NULL);
+#else
+			fprintf(fpe, "Warning: Ignoring -j/--jspl option.  This version of easypmp\n");
+			fprintf(fpe, "         was built without support for JavaScript playlists.\n");
+#endif
 		}
 		easypmp_playlist(&playlists, &musics, pmp, &opt, records, num_records, easypmp_progress, NULL);
+
 	}
 	if (opt.verb & MODE_DATABASE_REPR) {
 		database_dump(pmp, fpo, opt.repr_level);

Modified: trunk/frontend/easypmp/cui/option.c
===================================================================
--- trunk/frontend/easypmp/cui/option.c	2006-07-29 20:54:17 UTC (rev 151)
+++ trunk/frontend/easypmp/cui/option.c	2006-07-29 21:56:41 UTC (rev 152)
@@ -82,7 +82,9 @@
 	fprintf(fp, "  -r, --reconvert       Discard the existing playlist files and reconvert\n");
 	fprintf(fp, "  -f, --find-missing    Correct playlists with corrupt references to media files\n");
 	fprintf(fp, "  -s, --skip-missing    Continue a conversion even if a media file is missing\n");
+#ifdef HAVE_JSAPI_H
 	fprintf(fp, "  -j, --jspl            Enable JavaScript playlist (JSPL)\n");
+#endif
 	fprintf(fp, "\n");
 	fprintf(fp, "Player options:\n");
 	fprintf(fp, "  -l, --list-device     Show the list of supported devices and exit\n");


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