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

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

Revision: 107
Author:   nyaochi
Date:     2006-07-02 05:04:58 -0700 (Sun, 02 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=107&view=rev

Log Message:
-----------
Added initialization interface for option_t.

Modified Paths:
--------------
    trunk/frontend/easypmp/cui/main.c
    trunk/frontend/easypmp/cui/option.c
    trunk/frontend/easypmp/cui/option.h
    trunk/frontend/easypmp/win32gui/easypmp_win32gui.vcproj
Modified: trunk/frontend/easypmp/cui/main.c
===================================================================
--- trunk/frontend/easypmp/cui/main.c	2006-07-02 11:51:36 UTC (rev 106)
+++ trunk/frontend/easypmp/cui/main.c	2006-07-02 12:04:58 UTC (rev 107)
@@ -204,6 +204,9 @@
 
 	setlocale(LC_ALL, "");
 
+	// Initialize option values.
+	option_init(&opt);
+
 	// Show copyright information.
 	fprintf(fpe, APPLICATION_S " " VERSION_S "  " COPYRIGHT_S "\n");
 	fprintf(fpe, "\n");
@@ -348,6 +351,7 @@
 
 	pmp->release(pmp);
 	pmphelp_finish(pmphelp);
+	option_finish(&opt);
 
 	return ret;
 
@@ -360,5 +364,6 @@
 		pmphelp_finish(pmphelp);
 		pmphelp = NULL;
 	}
+	option_finish(&opt);
 	return ret;
 }

Modified: trunk/frontend/easypmp/cui/option.c
===================================================================
--- trunk/frontend/easypmp/cui/option.c	2006-07-02 11:51:36 UTC (rev 106)
+++ trunk/frontend/easypmp/cui/option.c	2006-07-02 12:04:58 UTC (rev 107)
@@ -101,15 +101,32 @@
 	easypmp_set_strip_words(opt, ucs2str);
 }
 
-int option_parse(option_t* opt, int argc, char *argv[], FILE *fpe)
+void option_init(option_t* opt)
 {
-	int used_args = 0;
-
 	memset(opt, 0, sizeof(*opt));
 
+	// Set default values here.
 	opt->media_info_source |= (GMIF_TAG | GMIF_STRIP_ARTIST);
 	set_strip_words(opt, "the ");
+}
 
+void option_finish(option_t* opt)
+{
+	int i;
+
+	for (i = 0;i < opt->num_strip_words;++i) {
+		ucs2free(opt->strip_words[i]);
+	}
+	ucs2free(opt->strip_words);
+	free(opt->system_encoding);
+	free(opt->music_encoding);
+	memset(opt, 0, sizeof(*opt));
+}
+
+int option_parse(option_t* opt, int argc, char *argv[], FILE *fpe)
+{
+	int used_args = 0;
+
 	/* Parse the command-line arguments. */
 	for (;;) {
 		int this_option_optind = optind ? optind : 1;

Modified: trunk/frontend/easypmp/cui/option.h
===================================================================
--- trunk/frontend/easypmp/cui/option.h	2006-07-02 11:51:36 UTC (rev 106)
+++ trunk/frontend/easypmp/cui/option.h	2006-07-02 12:04:58 UTC (rev 107)
@@ -25,7 +25,9 @@
 #ifndef	__OPTION_H__
 #define	__OPTION_H__
 
+void option_init(option_t* opt);
+void option_finish(option_t* opt);
+int option_parse(option_t* opt, int argc, char *argv[], FILE *fpe);
 void option_usage(FILE *fp, const char *argv0);
-int option_parse(option_t* opt, int argc, char *argv[], FILE *fpe);
 
 #endif/*__OPTION_H__*/

Modified: trunk/frontend/easypmp/win32gui/easypmp_win32gui.vcproj
===================================================================
--- trunk/frontend/easypmp/win32gui/easypmp_win32gui.vcproj	2006-07-02 11:51:36 UTC (rev 106)
+++ trunk/frontend/easypmp/win32gui/easypmp_win32gui.vcproj	2006-07-02 12:04:58 UTC (rev 107)
@@ -201,6 +201,9 @@
 			<File
 				RelativePath=".\res\processing.ico">
 			</File>
+			<File
+				RelativePath=".\res\queuing.ico">
+			</File>
 		</Filter>
 		<Filter
 			Name="common">


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