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

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

Revision: 288
          http://svn.sourceforge.net/pmplib/?rev=288&view=rev
Author:   nyaochi
Date:     2007-01-26 07:59:23 -0800 (Fri, 26 Jan 2007)

Log Message:
-----------
Show supported audio codecs and extensions.

Modified Paths:
--------------
    trunk/pmplib/frontend/easypmp/cui/device.c
    trunk/pmplib/frontend/easypmp/cui/main.c

Modified: trunk/pmplib/frontend/easypmp/cui/device.c
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/device.c	2007-01-26 15:39:06 UTC (rev 287)
+++ trunk/pmplib/frontend/easypmp/cui/device.c	2007-01-26 15:59:23 UTC (rev 288)
@@ -59,6 +59,8 @@
 
 void device_show_information(pmp_t* pmp, FILE *fp)
 {
+	int i;
+
 	fprintf(fp, "Device identifier: %s\n", pmp->info.decl.id);
 	fprintf(fp, "  Manufacturer: %s\n", pmp->info.decl.manufacturer);
 	fprintf(fp, "  Product name: %s\n", pmp->info.decl.name);
@@ -67,6 +69,25 @@
 	fprintf(fp, "  Firmware range: %s to %s\n", pmp->info.decl.min_version, pmp->info.decl.max_version);
 	fprintf(fp, "  Default language: %s\n", pmp->info.decl.language);
 
+	fprintf(fp, "  Audio codec(s): ");
+	for (i = 0;i < pmp->info.num_audio_codecs;++i) {
+		switch (pmp->info.audio_codecs[i]) {
+		case PMPCODEC_MPEGLAYER3:	fputs("MP3", fp);		break;
+		case PMPCODEC_WMA:			fputs("WMA", fp);		break;
+		case PMPCODEC_VORBIS:		fputs("Ogg Vorbis", fp);	break;
+		case PMPCODEC_WAV:			fputs("WAV", fp);		break;
+		}
+		if (i != pmp->info.num_audio_codecs-1)	fputs(", ", fp);
+	}
+	fputc('\n', fp);
+
+	fprintf(fp, "  Audio extension(s): ");
+	for (i = 0;i < pmp->info.num_audio_extensions;++i) {
+		fprints(fp, "%s", pmp->info.audio_extensions[i]);
+		if (i != pmp->info.num_audio_extensions-1)	fputs(";", fp);
+	}
+	fputc('\n', fp);
+
 	fprints(fp, "  Root directory: %s\n", pmp->info.path_to_root);
 	device_show_path(fp, "  Music directory: %s\n", pmp->info.path_to_music);
 	device_show_path(fp, "  Playlist directory: %s\n", pmp->info.path_to_playlist);

Modified: trunk/pmplib/frontend/easypmp/cui/main.c
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/main.c	2007-01-26 15:39:06 UTC (rev 287)
+++ trunk/pmplib/frontend/easypmp/cui/main.c	2007-01-26 15:59:23 UTC (rev 288)
@@ -94,7 +94,7 @@
 	case EASYPMPP_START:
 		break;
 	case EASYPMPP_OPEN|EASYPMPSP_START:
-		fprintf(fpo, "Opening the device\n");
+		fprintf(fpo, "Opening the portable media device\n");
 		break;
 	case EASYPMPP_OPEN|EASYPMPSP_END:
 		fprintf(fpo, "\n");
@@ -117,7 +117,6 @@
 	case EASYPMPP_MUSIC_GMI|EASYPMPSP_END:
 		console_clearln(fpo);
 		fprintf(fpo, "  %d files were imported\n", param_int);
-		fprintf(fpo, "\n");
 		break;
 	case EASYPMPP_MUSIC_UPDATE|EASYPMPSP_START:
 		fprintf(fpo, "Updating database entries\n");
@@ -361,7 +360,7 @@
 		fprintf(fpe, "Enumerating playlist files\n");
 		easypmp_enumerate_playlist(&playlists, pmp, &opt, easypmp_enumerate_progress, NULL);
 		console_clearln(fpo);
-		fprintf(fpo, "  %d music files were found\n", playlists.num_elements);
+		fprintf(fpo, "  %d playlist files were found\n", playlists.num_elements);
 		fprintf(fpo, "\n");
 	}
 


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