OSDN > Finden Software > Multimedia > Video > Non-Linear Editor > Video maid > SCM > SVN > Commit

Video maid

R/O
SSH
HTTPS

vmaid: Commit

Commit MetaInfo

Revision	320 (tree)
Zeit	2010-06-29 05:36:40
Autor	iwm

Log Message

modify archive folder

Ändern Zusammenfassung

modified: vmaid/trunk/ChangeLog (diff)
modified: vmaid/trunk/avicore/avisave.c (diff)
modified: vmaid/trunk/avicore/aviopen.c (diff)
modified: vmaid/trunk/avicore/avipcm.c (diff)
modified: vmaid/trunk/avicore/avitext.c (diff)
modified: vmaid/trunk/misc/profile.c (diff)
modified: vmaid/trunk/misc/profile.h (diff)
modified: vmaid/trunk/misc/fileio.c (diff)
modified: vmaid/trunk/Makefile.msc.in (diff)
modified: vmaid/trunk/orz/orzmdi.c (diff)

Diff

--- vmaid/trunk/ChangeLog (revision 319)

+++ vmaid/trunk/ChangeLog (revision 320)

		@@ -2,6 +2,10 @@
2	2
3	3	* version 2.2.4
4	4
	5	+2010-06-29 Kazuki Iwamoto <iwm@maid.org>
	6	+
	7	+ * Makefile.msc.in: modify archive folder
	8	+
5	9	2010-06-26 Kazuki Iwamoto <iwm@maid.org>
6	10
7	11	* configure.ac:

--- vmaid/trunk/avicore/avisave.c (revision 319)

+++ vmaid/trunk/avicore/avisave.c (revision 320)

		@@ -1,10 +1,10 @@
1	1	/*
2	2	avicore
3		- copyright (c) 1998-2007 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org
	3	+ copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
4	4
5		- This program is free software; you can redistribute it and/or modify
	5	+ This program is free software: you can redistribute it and/or modify
6	6	it under the terms of the GNU General Public License as published by
7		- the Free Software Foundation; either version 2 of the License, or
	7	+ the Free Software Foundation, either version 3 of the License, or
8	8	(at your option) any later version.
9	9
10	10	This program is distributed in the hope that it will be useful,

		@@ -13,8 +13,7 @@
13	13	GNU General Public License for more details.
14	14
15	15	You should have received a copy of the GNU General Public License
16		- along with this program; if not, write to the Free Software
17		- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	16	+ along with this program. If not, see <http://www.gnu.org/licenses/>.
18	17	*/
19	18	#include "avibase.h"
20	19	#include "avifmt.h"

		@@ -527,11 +526,17 @@
527	526	written += length;
528	527	}
529	528	}
530		- if ((acm_object && !acm_close (acm_object)) \| !avi_pcm_close (avi_pcm))
	529	+ if (acm_object && !acm_close (acm_object))
531	530	{
	531	+ avi_pcm_close (avi_pcm);
532	532	fileio_close (fio);
533	533	return FALSE;
534	534	}
	535	+ if (!avi_pcm_close (avi_pcm))
	536	+ {
	537	+ fileio_close (fio);
	538	+ return FALSE;
	539	+ }
535	540	if (written & 1)
536	541	{
537	542	const static guint8 dmy = 0;

		@@ -752,14 +757,16 @@
752	757	static gboolean
753	758	avi_acm_close (AviAcm *avi_acm)
754	759	{
755		- gboolean result;
	760	+ gboolean result = TRUE;
756	761
757	762	if (!avi_acm)
758	763	return FALSE;
759		- result = (!avi_acm->avi_pcm \|\| avi_pcm_close (avi_acm->avi_pcm))
760		- & (!avi_acm->acm_flag
761		- \|\| acm_compress_end (avi_acm->acm_object, NULL, NULL))
762		- & (!avi_acm->acm_object \|\| acm_close (avi_acm->acm_object));
	764	+ if (avi_acm->avi_pcm && !avi_pcm_close (avi_acm->avi_pcm))
	765	+ result = FALSE;
	766	+ if (avi_acm->acm_flag && !acm_compress_end (avi_acm->acm_object, NULL, NULL))
	767	+ result = FALSE;
	768	+ if (avi_acm->acm_object && !acm_close (avi_acm->acm_object))
	769	+ result = FALSE;
763	770	g_free (avi_acm->wfx);
764	771	g_free (avi_acm->tmp_buf);
765	772	g_free (avi_acm);

		@@ -1815,29 +1822,38 @@
1815	1822	g_free (data);
1816	1823	/* ja:フレーム/圧縮 */
1817	1824	for (i = 0; i < streams; i++)
1818		- if ((stream[i].active && !icm_compress_end (stream[i].icm_object))
1819		- \| (stream[i].icm_object && !icm_close (stream[i].icm_object))
1820		- \| (stream[i].avi_frame && !avi_frame_close (stream[i].avi_frame))
1821		- \| (stream[i].avi_acm && !avi_acm_close (stream[i].avi_acm)))
1822		- {
1823		- fileio_close (fio);
1824		- while (++i < streams)
1825		- {
1826		- if (stream[i].active)
1827		- icm_compress_end (stream[i].icm_object);
1828		- if (stream[i].icm_object)
1829		- icm_close (stream[i].icm_object);
1830		- avi_frame_close (stream[i].avi_frame);
1831		- }
1832		- for (i = 0; i < streams; i++)
1833		- {
1834		- g_free (stream[i].fmt);
1835		- g_free (stream[i].base);
1836		- }
1837		- g_free (stream);
1838		- g_free (index);
1839		- return FALSE;
1840		- }
	1825	+ {
	1826	+ gboolean result = TRUE;
	1827	+
	1828	+ if (stream[i].active && !icm_compress_end (stream[i].icm_object))
	1829	+ result = FALSE;
	1830	+ if (stream[i].icm_object && !icm_close (stream[i].icm_object))
	1831	+ result = FALSE;
	1832	+ if (stream[i].avi_frame && !avi_frame_close (stream[i].avi_frame))
	1833	+ result = FALSE;
	1834	+ if (stream[i].avi_acm && !avi_acm_close (stream[i].avi_acm))
	1835	+ result = FALSE;
	1836	+ if (!result)
	1837	+ {
	1838	+ fileio_close (fio);
	1839	+ while (++i < streams)
	1840	+ {
	1841	+ if (stream[i].active)
	1842	+ icm_compress_end (stream[i].icm_object);
	1843	+ if (stream[i].icm_object)
	1844	+ icm_close (stream[i].icm_object);
	1845	+ avi_frame_close (stream[i].avi_frame);
	1846	+ }
	1847	+ for (i = 0; i < streams; i++)
	1848	+ {
	1849	+ g_free (stream[i].fmt);
	1850	+ g_free (stream[i].base);
	1851	+ }
	1852	+ g_free (stream);
	1853	+ g_free (index);
	1854	+ return FALSE;
	1855	+ }
	1856	+ }
1841	1857	/* ja:ファイナライズ */
1842	1858	if (!avi_save_avi_write (fio, NULL, 0, 0, AVI_SAVE_WRITE_FINALIZE,
1843	1859	&index, &entries, &riff, &movi, stream, streams, -1))

		@@ -2560,29 +2576,38 @@
2560	2576	g_free (data);
2561	2577	/* ja:フレーム/圧縮 */
2562	2578	for (i = 0; i < streams; i++)
2563		- if ((stream[i].active && !icm_compress_end (stream[i].icm_object))
2564		- \| (stream[i].icm_object && !icm_close (stream[i].icm_object))
2565		- \| (stream[i].avi_frame && !avi_frame_close (stream[i].avi_frame))
2566		- \| (stream[i].avi_acm && !avi_acm_close (stream[i].avi_acm)))
2567		- {
2568		- fileio_close (fio);
2569		- while (++i < streams)
2570		- {
2571		- if (stream[i].active)
2572		- icm_compress_end (stream[i].icm_object);
2573		- if (stream[i].icm_object)
2574		- icm_close (stream[i].icm_object);
2575		- avi_frame_close (stream[i].avi_frame);
2576		- }
2577		- for (i = 0; i < streams; i++)
2578		- {
2579		- g_free (stream[i].fmt);
2580		- g_free (stream[i].index);
2581		- }
2582		- g_free (stream);
2583		- return FALSE;
2584		- }
	2579	+ {
	2580	+ gboolean result = TRUE;
2585	2581
	2582	+ if (stream[i].active && !icm_compress_end (stream[i].icm_object))
	2583	+ result = FALSE;
	2584	+ if (stream[i].icm_object && !icm_close (stream[i].icm_object))
	2585	+ result = FALSE;
	2586	+ if (stream[i].avi_frame && !avi_frame_close (stream[i].avi_frame))
	2587	+ result = FALSE;
	2588	+ if (stream[i].avi_acm && !avi_acm_close (stream[i].avi_acm))
	2589	+ result = FALSE;
	2590	+ if (!result)
	2591	+ {
	2592	+ fileio_close (fio);
	2593	+ while (++i < streams)
	2594	+ {
	2595	+ if (stream[i].active)
	2596	+ icm_compress_end (stream[i].icm_object);
	2597	+ if (stream[i].icm_object)
	2598	+ icm_close (stream[i].icm_object);
	2599	+ avi_frame_close (stream[i].avi_frame);
	2600	+ }
	2601	+ for (i = 0; i < streams; i++)
	2602	+ {
	2603	+ g_free (stream[i].fmt);
	2604	+ g_free (stream[i].index);
	2605	+ }
	2606	+ g_free (stream);
	2607	+ return FALSE;
	2608	+ }
	2609	+ }
	2610	+
2586	2611	/* ja:ヘッタを設定する */
2587	2612	p = data = g_malloc0 (header);
2588	2613

--- vmaid/trunk/avicore/aviopen.c (revision 319)

+++ vmaid/trunk/avicore/aviopen.c (revision 320)

		@@ -1,10 +1,10 @@
1	1	/*
2	2	avicore
3		- copyright (c) 1998-2007 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org
	3	+ copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
4	4
5		- This program is free software; you can redistribute it and/or modify
	5	+ This program is free software: you can redistribute it and/or modify
6	6	it under the terms of the GNU General Public License as published by
7		- the Free Software Foundation; either version 2 of the License, or
	7	+ the Free Software Foundation, either version 3 of the License, or
8	8	(at your option) any later version.
9	9
10	10	This program is distributed in the hope that it will be useful,

		@@ -13,8 +13,7 @@
13	13	GNU General Public License for more details.
14	14
15	15	You should have received a copy of the GNU General Public License
16		- along with this program; if not, write to the Free Software
17		- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	16	+ along with this program. If not, see <http://www.gnu.org/licenses/>.
18	17	*/
19	18	#include "avibase.h"
20	19	#include "avifmt.h"

		@@ -157,15 +156,26 @@
157	156	}
158	157	case AVI_FILE_GSR:
159	158	{
160		- FileIO *fio;
161		- GsrMainHeader gmh;
	159	+ gint streams = 0;
162	160
163	161	/* ja:ファイルを開く */
164		- return file && (fio = fileio_open (file, FILEIO_ACCESS_READ,
165		- FILEIO_SHARE_READ, FILEIO_MODE_OPEN_EXISTING))
166		- && ((fileio_read (fio, &gmh, GMH_SIZE) == GMH_SIZE)
167		- & fileio_close (fio))
168		- ? gmh_get_streams (&gmh) : 0;
	162	+ if (file)
	163	+ {
	164	+ FileIO *fio;
	165	+
	166	+ fio = fileio_open (file, FILEIO_ACCESS_READ,
	167	+ FILEIO_SHARE_READ, FILEIO_MODE_OPEN_EXISTING);
	168	+ if (fio)
	169	+ {
	170	+ gboolean result;
	171	+ GsrMainHeader gmh;
	172	+
	173	+ result = fileio_read (fio, &gmh, GMH_SIZE) == GMH_SIZE;
	174	+ if (fileio_close (fio) && result)
	175	+ streams = gmh_get_streams (&gmh);
	176	+ }
	177	+ }
	178	+ return streams;
169	179	}
170	180	case AVI_FILE_BITMAP:
171	181	case AVI_FILE_PIXBUF:

		@@ -216,17 +226,21 @@
216	226	}
217	227	else
218	228	{
	229	+ gboolean result = FALSE;
219	230	IcmObject *icm_object;
220	231
221	232	/* ja:圧縮 */
222	233	icm_object = icm_open (avi_edit->file->handler, ICM_MODE_DECOMPRESS);
223		- if (!icm_object
224		- \|\| !(avi_edit->bmih = g_malloc (icm_decompress_get_format_size
225		- (icm_object, avi_edit->file->bmih)))
226		- \|\| (!icm_decompress_get_format (icm_object,
227		- avi_edit->file->bmih, avi_edit->bmih)
228		- \| !icm_close (icm_object)))
	234	+ if (icm_object)
229	235	{
	236	+ avi_edit->bmih = g_malloc (icm_decompress_get_format_size
	237	+ (icm_object, avi_edit->file->bmih));
	238	+ result = icm_decompress_get_format (icm_object,
	239	+ avi_edit->file->bmih, avi_edit->bmih);
	240	+ result = icm_close (icm_object) && result;
	241	+ }
	242	+ if (!result)
	243	+ {
230	244	avi_file_close (avi_edit->file);
231	245	g_free (avi_edit->bmih);
232	246	g_free (avi_edit);

		@@ -245,17 +259,21 @@
245	259	}
246	260	else
247	261	{
	262	+ gboolean result = FALSE;
248	263	AcmObject *acm_object;
249	264
250	265	/* ja:圧縮 */
251	266	acm_object = acm_open (wfx_get_format_tag (avi_edit->file->wfx));
252		- if (!acm_object
253		- \|\| !(avi_edit->wfx = g_malloc (acm_decompress_get_format_size
254		- (acm_object, avi_edit->file->wfx)))
255		- \|\| (!acm_decompress_get_format (acm_object,
256		- avi_edit->file->wfx, avi_edit->wfx)
257		- \| !acm_close (acm_object)))
	267	+ if (acm_object)
258	268	{
	269	+ avi_edit->wfx = g_malloc (acm_decompress_get_format_size
	270	+ (acm_object, avi_edit->file->wfx));
	271	+ result = acm_decompress_get_format (acm_object,
	272	+ avi_edit->file->wfx, avi_edit->wfx);
	273	+ result = acm_close (acm_object) && result;
	274	+ }
	275	+ if (!result)
	276	+ {
259	277	avi_file_close (avi_edit->file);
260	278	g_free (avi_edit->wfx);
261	279	g_free (avi_edit);

		@@ -377,17 +395,21 @@
377	395	}
378	396	else
379	397	{
	398	+ gboolean result = FALSE;
380	399	AcmObject *acm_object;
381	400
382	401	/* ja:圧縮 */
383	402	acm_object = acm_open (wfx_get_format_tag (avi_edit->file->wfx));
384		- if (!acm_object
385		- \|\| !(avi_edit->wfx = g_malloc
	403	+ if (acm_object)
	404	+ {
	405	+ avi_edit->wfx = g_malloc
386	406	(acm_decompress_get_format_size (acm_object,
387		- avi_edit->file->wfx)))
388		- \|\| (!acm_decompress_get_format (acm_object,
389		- avi_edit->file->wfx, avi_edit->wfx)
390		- \| !acm_close (acm_object)))
	407	+ avi_edit->file->wfx));
	408	+ result = acm_decompress_get_format (acm_object,
	409	+ avi_edit->file->wfx, avi_edit->wfx);
	410	+ result = acm_close (acm_object) && result;
	411	+ }
	412	+ if (!result)
391	413	{
392	414	avi_file_close (avi_edit->file);
393	415	g_free (avi_edit->wfx);

--- vmaid/trunk/avicore/avipcm.c (revision 319)

+++ vmaid/trunk/avicore/avipcm.c (revision 320)

		@@ -1,10 +1,10 @@
1	1	/*
2	2	avicore
3		- copyright (c) 1998-2006 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org
	3	+ copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
4	4
5		- This program is free software; you can redistribute it and/or modify
	5	+ This program is free software: you can redistribute it and/or modify
6	6	it under the terms of the GNU General Public License as published by
7		- the Free Software Foundation; either version 2 of the License, or
	7	+ the Free Software Foundation, either version 3 of the License, or
8	8	(at your option) any later version.
9	9
10	10	This program is distributed in the hope that it will be useful,

		@@ -13,8 +13,7 @@
13	13	GNU General Public License for more details.
14	14
15	15	You should have received a copy of the GNU General Public License
16		- along with this program; if not, write to the Free Software
17		- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	16	+ along with this program. If not, see <http://www.gnu.org/licenses/>.
18	17	*/
19	18	#include "avibase.h"
20	19

		@@ -64,12 +63,14 @@
64	63	gboolean
65	64	avi_pcm_close (AviPcm *avi_pcm)
66	65	{
67		- gboolean result;
	66	+ gboolean result = TRUE;
68	67
69	68	if (!avi_pcm)
70	69	return FALSE;
71		- result = (!avi_pcm->wcv \|\| wave_convert_end (avi_pcm->wcv, NULL, NULL))
72		- & (!avi_pcm->acm_object \|\| acm_close (avi_pcm->acm_object));
	70	+ if (avi_pcm->wcv && !wave_convert_end (avi_pcm->wcv, NULL, NULL))
	71	+ result = FALSE;
	72	+ if (avi_pcm->acm_object && !acm_close (avi_pcm->acm_object))
	73	+ result = FALSE;
73	74	g_free (avi_pcm->wfx);
74	75	g_free (avi_pcm->tmp_buf);
75	76	g_free (avi_pcm);

		@@ -194,13 +195,14 @@
194	195	avi_pcm->marker = -1;
195	196	if (avi_pcm->acm_object)
196	197	{
	198	+ gboolean result;
197	199	gpointer e_buf = NULL;
198	200	gsize e_samples;
199	201
200		- if ((!acm_decompress_end (avi_pcm->acm_object,
201		- &e_buf, &e_samples)
202		- \| !acm_close (avi_pcm->acm_object))
203		- \|\| !wave_convert (avi_pcm->wcv,
	202	+ result = acm_decompress_end (avi_pcm->acm_object,
	203	+ &e_buf, &e_samples);
	204	+ if (!acm_close (avi_pcm->acm_object) \|\| !result
	205	+ \|\| !wave_convert (avi_pcm->wcv,
204	206	e_buf, e_samples, &conv_buf, &conv_samples))
205	207	{
206	208	g_free (e_buf);

		@@ -285,12 +287,13 @@
285	287
286	288	if (avi_pcm->acm_object)
287	289	{
	290	+ gboolean result;
288	291	gpointer e_buf = NULL;
289	292	gsize e_samples;
290	293
291		- if ((!acm_decompress_end (avi_pcm->acm_object,
292		- &e_buf, &e_samples)
293		- \| !acm_close (avi_pcm->acm_object))
	294	+ result = acm_decompress_end (avi_pcm->acm_object,
	295	+ &e_buf, &e_samples);
	296	+ if (!acm_close (avi_pcm->acm_object) \|\| !result
294	297	\|\| !wave_convert (avi_pcm->wcv,
295	298	e_buf, e_samples, &conv_buf, &conv_samples))
296	299	{

--- vmaid/trunk/avicore/avitext.c (revision 319)

+++ vmaid/trunk/avicore/avitext.c (revision 320)

		@@ -1,10 +1,10 @@
1	1	/*
2	2	avicore
3		- copyright (c) 1998-2007 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org
	3	+ copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
4	4
5		- This program is free software; you can redistribute it and/or modify
	5	+ This program is free software: you can redistribute it and/or modify
6	6	it under the terms of the GNU General Public License as published by
7		- the Free Software Foundation; either version 2 of the License, or
	7	+ the Free Software Foundation, either version 3 of the License, or
8	8	(at your option) any later version.
9	9
10	10	This program is distributed in the hope that it will be useful,

		@@ -13,8 +13,7 @@
13	13	GNU General Public License for more details.
14	14
15	15	You should have received a copy of the GNU General Public License
16		- along with this program; if not, write to the Free Software
17		- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	16	+ along with this program. If not, see <http://www.gnu.org/licenses/>.
18	17	*/
19	18	#include "avibase.h"
20	19	#include "avifmt.h"

		@@ -607,6 +606,8 @@
607	606	{
608	607	for (i = 0; i < count; i++)
609	608	{
	609	+ gboolean result = FALSE;
	610	+
610	611	/* ja:サンプル数 */
611	612	if (avi_edit[i]->file)
612	613	{

		@@ -637,6 +638,7 @@
637	638	if (bmih_get_size_image (avi_edit[i]->bmih) <= 0)
638	639	bmih_set_size_image (avi_edit[i]->bmih,
639	640	bm_image_bytes (avi_edit[i]->bmih));
	641	+ result = TRUE;
640	642	}
641	643	else
642	644	{

		@@ -650,24 +652,14 @@
650	652	avi_edit[i]->bmih = g_malloc
651	653	(icm_decompress_get_format_size (icm_object,
652	654	avi_edit[i]->file->bmih));
653		- if (icm_decompress_get_format (icm_object,
654		- avi_edit[i]->file->bmih, avi_edit[i]->bmih)
655		- & icm_close (icm_object))
656		- {
657		- avi_edit[i]->bmih = g_realloc (avi_edit[i]->bmih,
	655	+ result = icm_decompress_get_format (icm_object,
	656	+ avi_edit[i]->file->bmih, avi_edit[i]->bmih);
	657	+ if (icm_close (icm_object) && result)
	658	+ avi_edit[i]->bmih = g_realloc (avi_edit[i]->bmih,
658	659	bm_header_bytes (avi_edit[i]->bmih));
659		- }
660	660	else
661		- {
662		- avi_edit_close (avi_edit[i]);
663		- avi_edit[i] = NULL;
664		- }
	661	+ result = FALSE;
665	662	}
666		- else
667		- {
668		- avi_edit_close (avi_edit[i]);
669		- avi_edit[i] = NULL;
670		- }
671	663	}
672	664	}
673	665	else if (avi_edit[i] && !avi_edit[i]->wfx

		@@ -677,6 +669,7 @@
677	669	{
678	670	avi_edit[i]->wfx = g_memdup (avi_edit[i]->file->wfx,
679	671	wf_header_bytes (avi_edit[i]->file->wfx));
	672	+ result = TRUE;
680	673	}
681	674	else
682	675	{

		@@ -685,25 +678,32 @@
685	678	/* ja:圧縮 */
686	679	acm_object = acm_open
687	680	(wfx_get_format_tag (avi_edit[i]->file->wfx));
688		- if (acm_object && (avi_edit[i]->wfx
	681	+ if (acm_object)
	682	+ {
	683	+ avi_edit[i]->wfx
689	684	= g_malloc (acm_decompress_get_format_size
690		- (acm_object, avi_edit[i]->file->wfx)))
691		- && (acm_decompress_get_format (acm_object,
692		- avi_edit[i]->file->wfx, avi_edit[i]->wfx)
693		- & acm_close (acm_object)))
694		- {
695		- avi_edit[i]->rate
	685	+ (acm_object, avi_edit[i]->file->wfx));
	686	+ result = acm_decompress_get_format (acm_object,
	687	+ avi_edit[i]->file->wfx, avi_edit[i]->wfx);
	688	+ if (acm_close (acm_object) && result)
	689	+ {
	690	+ avi_edit[i]->rate
696	691	= wfx_get_average_bytes_per_sec (avi_edit[i]->wfx);
697		- avi_edit[i]->scale
	692	+ avi_edit[i]->scale
698	693	= wfx_get_block_align (avi_edit[i]->wfx);
	694	+ }
	695	+ else
	696	+ {
	697	+ result = FALSE;
	698	+ }
699	699	}
700		- else
701		- {
702		- avi_edit_close (avi_edit[i]);
703		- avi_edit[i] = NULL;
704		- }
705	700	}
706	701	}
	702	+ if (!result)
	703	+ {
	704	+ avi_edit_close (avi_edit[i]);
	705	+ avi_edit[i] = NULL;
	706	+ }
707	707	#ifdef XXX
708	708	g_print("type=%X,rate=%u,scale=%u,length=%d\n",avi_edit[i]->type,avi_edit[i]->rate,avi_edit[i]->scale,avi_edit[i]->length);
709	709	for (avi_file=avi_edit[i]->file;avi_file!=NULL;

--- vmaid/trunk/misc/profile.c (revision 319)

+++ vmaid/trunk/misc/profile.c (revision 320)

		@@ -43,12 +43,12 @@
43	43
44	44	/******************************************************************************
45	45	* *
46		-* ja:初期化ファイル関数群(内部) *
	46	+* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ髢｢謨ｰ鄒､(蜀?Κ) *
47	47	* *
48	48	******************************************************************************/
49		-/* ja:リストをテキスト化する
50		- profile_list,リスト
51		- RET,テキストリスト */
	49	+/* ja:繝ｪ繧ｹ繝医ｒ繝?く繧ｹ繝亥喧縺吶ｋ
	50	+ profile_list,繝ｪ繧ｹ繝
	51	+ RET,繝?く繧ｹ繝医Μ繧ｹ繝 */
52	52	static gchar *
53	53	profile_list_to_text (ProfileList *profile_list)
54	54	{

		@@ -72,9 +72,9 @@
72	72	}
73	73
74	74
75		-/* ja:テキストをリスト化する
76		- text,テキスト
77		- RET,リスト */
	75	+/* ja:繝?く繧ｹ繝医ｒ繝ｪ繧ｹ繝亥喧縺吶ｋ
	76	+ text,繝?く繧ｹ繝
	77	+ RET,繝ｪ繧ｹ繝 */
78	78	static ProfileList *
79	79	profile_list_from_text (const gchar *text)
80	80	{

		@@ -82,13 +82,13 @@
82	82	gint i, j = 0;
83	83	ProfileList p = NULL, q, *r;
84	84
85		- /* ja:CRLFをLFに変換する */
	85	+ /* ja:CRLF繧鱈F縺ｫ螟画鋤縺吶ｋ */
86	86	buf = g_strdup (text);
87	87	for (i = 0; buf[i] != '\0'; i++)
88	88	if (buf[i] != '\r' \|\| buf[i + 1] != '\n')
89	89	buf[j++] = buf[i];
90	90	buf[j] = '\0';
91		- /* ja:CRをLFに変換する */
	91	+ /* ja:CR繧鱈F縺ｫ螟画鋤縺吶ｋ */
92	92	for (i = 0; buf[i] != '\0'; i++)
93	93	if (buf[i] == '\r')
94	94	buf[i] = '\n';

		@@ -108,7 +108,7 @@
108	108	while (p->prev)
109	109	p = p->prev;
110	110	r = p;
111		- /* ja:リストを整理する */
	111	+ /* ja:繝ｪ繧ｹ繝医ｒ謨ｴ逅?☆繧 */
112	112	while (p)
113	113	{
114	114	gsize n;

		@@ -155,9 +155,9 @@
155	155	}
156	156
157	157
158		-/* ja:ファイルをリスト化する
159		- file,ファイル名
160		- RET,リスト */
	158	+/* ja:繝輔ぃ繧､繝ｫ繧偵Μ繧ｹ繝亥喧縺吶ｋ
	159	+ file,繝輔ぃ繧､繝ｫ蜷
	160	+ RET,繝ｪ繧ｹ繝 */
161	161	static ProfileList *
162	162	profile_list_from_file (const gchar *file)
163	163	{

		@@ -177,8 +177,8 @@
177	177	}
178	178
179	179
180		-/* ja:初期化ファイルを解放する
181		- profile_list,リスト */
	180	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ繧定ｧ｣謾ｾ縺吶ｋ
	181	+ profile_list,繝ｪ繧ｹ繝 */
182	182	static void
183	183	profile_list_free (ProfileList *profile_list)
184	184	{

		@@ -197,12 +197,12 @@
197	197
198	198	/******************************************************************************
199	199	* *
200		-* ja:初期化ファイル関数群(独自) *
	200	+* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ髢｢謨ｰ鄒､(迢ｬ閾ｪ) *
201	201	* *
202	202	******************************************************************************/
203		-/* ja:初期化ファイルを開く
204		- file,ファイル名
205		- RET,プロファイル */
	203	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ繧帝幕縺
	204	+ file,繝輔ぃ繧､繝ｫ蜷
	205	+ RET,繝励Ο繝輔ぃ繧､繝ｫ */
206	206	Profile *
207	207	profile_open (const gchar *file)
208	208	{

		@@ -267,9 +267,9 @@
267	267	}
268	268
269	269
270		-/* ja:初期化ファイルを閉じる
271		- profile,プロファイル
272		- RET,TRUE:正常終了,FALSE:エラー */
	270	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ繧帝哩縺倥ｋ
	271	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	272	+ RET,TRUE:豁｣蟶ｸ邨ゆｺ?FALSE:繧ｨ繝ｩ繝ｼ */
273	273	gboolean
274	274	profile_close (Profile *profile)
275	275	{

		@@ -277,7 +277,7 @@
277	277	return TRUE;
278	278	if (profile->edit)
279	279	{
280		- /* ja:変更があったとき */
	280	+ /* ja:螟画峩縺後≠縺｣縺溘→縺 */
281	281	gchar *text;
282	282
283	283	text = profile_list_to_text (profile->list);

		@@ -295,11 +295,11 @@
295	295	}
296	296
297	297
298		-/* ja:初期化ファイルから文字列を取得する
299		- profile,プロファイル
300		- section,セクション
301		- key,キー
302		- RET,文字列,NULL:エラー */
	298	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺九ｉ譁?ｭ怜?繧貞叙蠕励☆繧
	299	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	300	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	301	+ key,繧ｭ繝ｼ
	302	+ RET,譁?ｭ怜?,NULL:繧ｨ繝ｩ繝ｼ */
303	303	gchar *
304	304	profile_get_string (Profile *profile,
305	305	const gchar *section,

		@@ -321,12 +321,12 @@
321	321	}
322	322
323	323
324		-/* ja:初期化ファイルから値のサイズ取得する
325		- profile,プロファイル
326		- section,セクション
327		- key,キー
328		- type,タイプ
329		- RET,バイト数,0:エラー */
	324	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺九ｉ蛟､縺ｮ繧ｵ繧､繧ｺ蜿門ｾ励☆繧
	325	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	326	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	327	+ key,繧ｭ繝ｼ
	328	+ type,繧ｿ繧､繝
	329	+ RET,繝舌う繝域焚,0:繧ｨ繝ｩ繝ｼ */
330	330	gsize
331	331	profile_get_size (Profile *profile,
332	332	const gchar *section,

		@@ -377,14 +377,14 @@
377	377	}
378	378
379	379
380		-/* ja:初期化ファイルから値を取得する
381		- profile,プロファイル
382		- section,セクション
383		- key,キー
384		- value,値を入れるバッファ
385		- size,値を入れるバッファのサイズ
386		- type,タイプ
387		- RET,TRUE:正常終了,FALSE:エラー */
	380	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺九ｉ蛟､繧貞叙蠕励☆繧
	381	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	382	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	383	+ key,繧ｭ繝ｼ
	384	+ value,蛟､繧貞?繧後ｋ繝舌ャ繝輔ぃ
	385	+ size,蛟､繧貞?繧後ｋ繝舌ャ繝輔ぃ縺ｮ繧ｵ繧､繧ｺ
	386	+ type,繧ｿ繧､繝
	387	+ RET,TRUE:豁｣蟶ｸ邨ゆｺ?FALSE:繧ｨ繝ｩ繝ｼ */
388	388	gboolean
389	389	profile_get_value (Profile *profile,
390	390	const gchar *section,

		@@ -455,14 +455,14 @@
455	455	}
456	456
457	457
458		-/* ja:初期化ファイルに値を設定する
459		- profile,プロファイル
460		- section,セクション
461		- key,キー
462		- value,値が入っているバッファ
463		- size,値が入っているバッファのサイズ
464		- type,タイプ
465		- RET,TRUE:正常終了,FALSE:エラー */
	458	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺ｫ蛟､繧定ｨｭ螳壹☆繧
	459	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	460	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	461	+ key,繧ｭ繝ｼ
	462	+ value,蛟､縺悟?縺｣縺ｦ縺?ｋ繝舌ャ繝輔ぃ
	463	+ size,蛟､縺悟?縺｣縺ｦ縺?ｋ繝舌ャ繝輔ぃ縺ｮ繧ｵ繧､繧ｺ
	464	+ type,繧ｿ繧､繝
	465	+ RET,TRUE:豁｣蟶ｸ邨ゆｺ?FALSE:繧ｨ繝ｩ繝ｼ */
466	466	gboolean
467	467	profile_set_value (Profile *profile,
468	468	const gchar *section,

		@@ -490,7 +490,7 @@
490	490	{
491	491	if (q)
492	492	{
493		- /* ja:前のデータとの間にスペースを入れる */
	493	+ /* ja:蜑阪?繝??繧ｿ縺ｨ縺ｮ髢薙↓繧ｹ繝壹?繧ｹ繧貞?繧後ｋ */
494	494	p = g_malloc (sizeof (ProfileList));
495	495	p->type = PROFILE_DATA_TYPE_SPACE;
496	496	p->data = p->section = p->key = p->value = NULL;

		@@ -499,7 +499,7 @@
499	499	q->next = p;
500	500	q = p;
501	501	}
502		- /* ja:セクションもキーもないときにはセクションを作る */
	502	+ /* ja:繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ繧ゅく繝ｼ繧ゅ↑縺?→縺阪↓縺ｯ繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ繧剃ｽ懊ｋ */
503	503	p = g_malloc (sizeof (ProfileList));
504	504	p->type = PROFILE_DATA_TYPE_SECTION;
505	505	p->data = g_strdup_printf ("[%s]", section);

		@@ -521,7 +521,7 @@
521	521	while (q->type == PROFILE_DATA_TYPE_SPACE && q->section
522	522	&& g_strcmp (p->section, section) == 0 && q->prev)
523	523	q = q->prev;
524		- /* ja:セクションの最後にキーを作る */
	524	+ /* ja:繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ縺ｮ譛?蠕後↓繧ｭ繝ｼ繧剃ｽ懊ｋ */
525	525	p = g_malloc (sizeof (ProfileList));
526	526	p->type = PROFILE_DATA_TYPE_KEY;
527	527	p->data = g_strdup_printf ("%s=", key);

		@@ -569,10 +569,10 @@
569	569	}
570	570
571	571
572		-/* ja:初期化ファイルのセクションを削除する
573		- profile,プロファイル
574		- section,セクション
575		- RET,TRUE:正常終了,FALSE:エラー */
	572	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺ｮ繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ繧貞炎髯､縺吶ｋ
	573	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	574	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	575	+ RET,TRUE:豁｣蟶ｸ邨ゆｺ?FALSE:繧ｨ繝ｩ繝ｼ */
576	576	gboolean
577	577	profile_delete_section (Profile *profile,
578	578	const gchar *section)

		@@ -603,11 +603,11 @@
603	603	}
604	604
605	605
606		-/* ja:初期化ファイルのキーを削除する
607		- profile,プロファイル
608		- section,セクション
609		- key,キー
610		- RET,TRUE:正常終了,FALSE:エラー */
	606	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺ｮ繧ｭ繝ｼ繧貞炎髯､縺吶ｋ
	607	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	608	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	609	+ key,繧ｭ繝ｼ
	610	+ RET,TRUE:豁｣蟶ｸ邨ゆｺ?FALSE:繧ｨ繝ｩ繝ｼ */
611	611	gboolean
612	612	profile_delete_key (Profile *profile,
613	613	const gchar *section,

		@@ -640,9 +640,9 @@
640	640	}
641	641
642	642
643		-/* ja:初期化ファイルのセクションを列挙する
644		- profile,プロファイル
645		- RET,セクションのリスト,NULL:エラー */
	643	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺ｮ繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ繧貞?謖吶☆繧
	644	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	645	+ RET,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ縺ｮ繝ｪ繧ｹ繝?NULL:繧ｨ繝ｩ繝ｼ */
646	646	GList *
647	647	profile_enum_section (Profile *profile)
648	648	{

		@@ -663,10 +663,10 @@
663	663	}
664	664
665	665
666		-/* ja:初期化ファイルのキーを列挙する
667		- profile,プロファイル
668		- section,セクション
669		- RET,セクションのリスト,NULL:エラー */
	666	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺ｮ繧ｭ繝ｼ繧貞?謖吶☆繧
	667	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	668	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	669	+ RET,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ縺ｮ繝ｪ繧ｹ繝?NULL:繧ｨ繝ｩ繝ｼ */
670	670	GList *
671	671	profile_enum_key (Profile *profile,
672	672	const gchar *section)

		@@ -692,7 +692,7 @@
692	692
693	693	/******************************************************************************
694	694	* *
695		-* ja:初期化ファイル関数群(互換) *
	695	+* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ髢｢謨ｰ鄒､(莠呈鋤) *
696	696	* *
697	697	******************************************************************************/
698	698	Profile *

		@@ -751,7 +751,7 @@
751	751	*error = NULL;
752	752	if (!profile)
753	753	return FALSE;
754		- /* ja:リスト解放 */
	754	+ /* ja:繝ｪ繧ｹ繝郁ｧ｣謾ｾ */
755	755	profile_list_free (profile->list);
756	756	profile_list_free (profile->sublist);
757	757	profile->list = profile->sublist = NULL;

--- vmaid/trunk/misc/profile.h (revision 319)

+++ vmaid/trunk/misc/profile.h (revision 320)

		@@ -1,6 +1,6 @@
1	1	/*
2	2	profile
3		- copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org
	3	+ copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
4	4
5	5	This program is free software: you can redistribute it and/or modify
6	6	it under the terms of the GNU General Public License as published by

		@@ -36,29 +36,29 @@
36	36
37	37	/******************************************************************************
38	38	* *
39		-* ja:初期化ファイル関数群(独自) *
	39	+* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ髢｢謨ｰ鄒､(迢ｬ閾ｪ) *
40	40	* *
41	41	******************************************************************************/
42		-/* ja:初期化ファイルを開く
43		- file,ファイル名
44		- RET,プロファイル */
	42	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ繧帝幕縺
	43	+ file,繝輔ぃ繧､繝ｫ蜷
	44	+ RET,繝励Ο繝輔ぃ繧､繝ｫ */
45	45	Profile *
46	46	profile_open (const gchar *file);
47	47
48	48
49		-/* ja:初期化ファイルを閉じる
50		- profile,プロファイル
51		- RET,TRUE:正常終了,FALSE:エラー */
	49	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ繧帝哩縺倥ｋ
	50	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	51	+ RET,TRUE:豁｣蟶ｸ邨ゆｺ?FALSE:繧ｨ繝ｩ繝ｼ */
52	52	gboolean
53	53	profile_close (Profile *profile);
54	54
55	55
56		-/* ja:初期化ファイルから値のサイズ取得する
57		- profile,プロファイル
58		- section,セクション
59		- key,キー
60		- type,タイプ
61		- RET,バイト数,0:エラー */
	56	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺九ｉ蛟､縺ｮ繧ｵ繧､繧ｺ蜿門ｾ励☆繧
	57	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	58	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	59	+ key,繧ｭ繝ｼ
	60	+ type,繧ｿ繧､繝
	61	+ RET,繝舌う繝域焚,0:繧ｨ繝ｩ繝ｼ */
62	62	gsize
63	63	profile_get_size (Profile *profile,
64	64	const gchar *section,

		@@ -66,11 +66,11 @@
66	66	const guint type);
67	67
68	68
69		-/* ja:初期化ファイルから文字列を取得する
70		- profile,プロファイル
71		- section,セクション
72		- key,キー
73		- RET,文字列,NULL:エラー */
	69	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺九ｉ譁?ｭ怜?繧貞叙蠕励☆繧
	70	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	71	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	72	+ key,繧ｭ繝ｼ
	73	+ RET,譁?ｭ怜?,NULL:繧ｨ繝ｩ繝ｼ */
74	74	gchar *
75	75	profile_get_string (Profile *profile,
76	76	const gchar *section,

		@@ -77,14 +77,14 @@
77	77	const gchar *key);
78	78
79	79
80		-/* ja:初期化ファイルから値を取得する
81		- profile,プロファイル
82		- section,セクション
83		- key,キー
84		- value,値を入れるバッファ
85		- size,値を入れるバッファのサイズ
86		- type,タイプ
87		- RET,TRUE:正常終了,FALSE:エラー */
	80	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺九ｉ蛟､繧貞叙蠕励☆繧
	81	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	82	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	83	+ key,繧ｭ繝ｼ
	84	+ value,蛟､繧貞?繧後ｋ繝舌ャ繝輔ぃ
	85	+ size,蛟､繧貞?繧後ｋ繝舌ャ繝輔ぃ縺ｮ繧ｵ繧､繧ｺ
	86	+ type,繧ｿ繧､繝
	87	+ RET,TRUE:豁｣蟶ｸ邨ゆｺ?FALSE:繧ｨ繝ｩ繝ｼ */
88	88	gboolean
89	89	profile_get_value (Profile *profile,
90	90	const gchar *section,

		@@ -94,14 +94,14 @@
94	94	const guint type);
95	95
96	96
97		-/* ja:初期化ファイルに値を設定する
98		- profile,プロファイル
99		- section,セクション
100		- key,キー
101		- value,値が入っているバッファ
102		- size,値が入っているバッファのサイズ
103		- type,タイプ
104		- RET,TRUE:正常終了,FALSE:エラー */
	97	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺ｫ蛟､繧定ｨｭ螳壹☆繧
	98	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	99	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	100	+ key,繧ｭ繝ｼ
	101	+ value,蛟､縺悟?縺｣縺ｦ縺?ｋ繝舌ャ繝輔ぃ
	102	+ size,蛟､縺悟?縺｣縺ｦ縺?ｋ繝舌ャ繝輔ぃ縺ｮ繧ｵ繧､繧ｺ
	103	+ type,繧ｿ繧､繝
	104	+ RET,TRUE:豁｣蟶ｸ邨ゆｺ?FALSE:繧ｨ繝ｩ繝ｼ */
105	105	gboolean
106	106	profile_set_value (Profile *profile,
107	107	const gchar *section,

		@@ -111,20 +111,20 @@
111	111	const guint type);
112	112
113	113
114		-/* ja:初期化ファイルのセクションを削除する
115		- profile,プロファイル
116		- section,セクション
117		- RET,TRUE:正常終了,FALSE:エラー */
	114	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺ｮ繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ繧貞炎髯､縺吶ｋ
	115	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	116	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	117	+ RET,TRUE:豁｣蟶ｸ邨ゆｺ?FALSE:繧ｨ繝ｩ繝ｼ */
118	118	gboolean
119	119	profile_delete_section (Profile *profile,
120	120	const gchar *section);
121	121
122	122
123		-/* ja:初期化ファイルのキーを削除する
124		- profile,プロファイル
125		- section,セクション
126		- key,キー
127		- RET,TRUE:正常終了,FALSE:エラー */
	123	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺ｮ繧ｭ繝ｼ繧貞炎髯､縺吶ｋ
	124	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	125	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	126	+ key,繧ｭ繝ｼ
	127	+ RET,TRUE:豁｣蟶ｸ邨ゆｺ?FALSE:繧ｨ繝ｩ繝ｼ */
128	128	gboolean
129	129	profile_delete_key (Profile *profile,
130	130	const gchar *section,

		@@ -131,17 +131,17 @@
131	131	const gchar *key);
132	132
133	133
134		-/* ja:初期化ファイルのセクションを列挙する
135		- profile,プロファイル
136		- RET,セクションのリスト,NULL:エラー */
	134	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺ｮ繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ繧貞?謖吶☆繧
	135	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	136	+ RET,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ縺ｮ繝ｪ繧ｹ繝?NULL:繧ｨ繝ｩ繝ｼ */
137	137	GList *
138	138	profile_enum_section (Profile *profile);
139	139
140	140
141		-/* ja:初期化ファイルのキーを列挙する
142		- profile,プロファイル
143		- section,セクション
144		- RET,セクションのリスト,NULL:エラー */
	141	+/* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ縺ｮ繧ｭ繝ｼ繧貞?謖吶☆繧
	142	+ profile,繝励Ο繝輔ぃ繧､繝ｫ
	143	+ section,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ
	144	+ RET,繧ｻ繧ｯ繧ｷ繝ｧ繝ｳ縺ｮ繝ｪ繧ｹ繝?NULL:繧ｨ繝ｩ繝ｼ */
145	145	GList *
146	146	profile_enum_key (Profile *profile,
147	147	const gchar *section);

		@@ -149,7 +149,7 @@
149	149
150	150	/******************************************************************************
151	151	* *
152		-* ja:初期化ファイル関数群(互換) *
	152	+* ja:蛻晄悄蛹悶ヵ繧｡繧､繝ｫ髢｢謨ｰ鄒､(莠呈鋤) *
153	153	* *
154	154	******************************************************************************/
155	155	#ifndef USE_KEYFILE_EMULATE

--- vmaid/trunk/misc/fileio.c (revision 319)

+++ vmaid/trunk/misc/fileio.c (revision 320)

		@@ -360,7 +360,7 @@
360	360	while (i < leng)
361	361	if (G_IS_DIR_SEPARATOR (absolate[i]) && absolate[i + 1] == '.'
362	362	&& absolate[i + 2] == '.'
363		- && (G_IS_DIR_SEPARATOR (absolate[i + 3]) \|\| absolate[i + 3] == '\0'))
	363	+ && (G_IS_DIR_SEPARATOR (absolate[i + 3]) \|\| absolate[i + 3] == '\0'))
364	364	{
365	365	gint j;
366	366

		@@ -638,7 +638,7 @@
638	638	# endif /* HAVE_FLOCK */
639	639	(mode == FILEIO_MODE_CREATE_ALWAYS && (
640	640	# ifdef HAVE_FTRUNCATE
641		- ftruncate (fd, 0) \|\|
	641	+ ftruncate (fd, 0) \|\|
642	642	# endif /* HAVE_FTRUNCATE */
643	643	lseek (fd, 0, SEEK_SET) == -1)))
644	644	{

		@@ -908,7 +908,7 @@
908	908	critical = TRUE;
909	909	# endif /* USE_THREAD */
910	910	result = fio && g_list_find (glist_fileio, fio)
911		- ? ftruncate (fio->fd, offset) == 0: FALSE;
	911	+ ? ftruncate (fio->fd, offset) == 0 : FALSE;
912	912	# ifdef USE_THREAD
913	913	critical = FALSE;
914	914	G_UNLOCK (critical);

--- vmaid/trunk/Makefile.msc.in (revision 319)

+++ vmaid/trunk/Makefile.msc.in (revision 320)

		@@ -270,6 +270,8 @@
270	270	copy /y vmaid.exe vmaid-$(VERSION)-win32\bin
271	271	mkdir vmaid-$(VERSION)-win32\doc
272	272	mkdir vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)
	273	+ mkdir vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)\en
	274	+ mkdir vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)\ja
273	275	copy /y $(TOP)\AUTHORS vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)
274	276	copy /y $(TOP)\CONTRIBUTORS vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)
275	277	copy /y $(TOP)\COPYING vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)

		@@ -278,10 +280,12 @@
278	280	copy /y $(TOP)\INSTALL.ja vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)
279	281	copy /y $(TOP)\NEWS vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)
280	282	copy /y $(TOP)\README vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)
281		- mkdir vmaid-$(VERSION)-win32\lib
282		- mkdir vmaid-$(VERSION)-win32\lib\locale
283		- mkdir vmaid-$(VERSION)-win32\lib\locale\ja
284		- mkdir vmaid-$(VERSION)-win32\lib\locale\ja\LC_MESSAGES
285		- copy /y locale\ja\LC_MESSAGES\vmaid.mo vmaid-$(VERSION)-win32\lib\locale\ja\LC_MESSAGES
	283	+ copy /y $(TOP)\doc\en\*.html vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)\en
	284	+ copy /y $(TOP)\doc\ja\*.html vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)\ja
	285	+ mkdir vmaid-$(VERSION)-win32\share
	286	+ mkdir vmaid-$(VERSION)-win32\share\locale
	287	+ mkdir vmaid-$(VERSION)-win32\share\locale\ja
	288	+ mkdir vmaid-$(VERSION)-win32\share\locale\ja\LC_MESSAGES
	289	+ copy /y locale\ja\LC_MESSAGES\vmaid.mo vmaid-$(VERSION)-win32\share\locale\ja\LC_MESSAGES
286	290	zip -9 -r vmaid-$(VERSION)-win32.zip vmaid-$(VERSION)-win32
287	291	rmdir /q /s vmaid-$(VERSION)-win32

--- vmaid/trunk/orz/orzmdi.c (revision 319)

+++ vmaid/trunk/orz/orzmdi.c (revision 320)

		@@ -42,7 +42,7 @@
42	42	gboolean created; /* ja:TRUE:新規作成,FALSE:既存ファイル */
43	43	gboolean edited; /* ja:TRUE:編集済み,FALSE:未編集 */
44	44	gchar *file;
45		- gint same; /* -2:名前のみ,-1:フルパス,0...:フルパス+数字 */
	45	+ gint same; /* ja:-2:名前のみ,-1:フルパス,0...:フルパス+数字 */
46	46	GtkWidget child, image, *label;
47	47	OrzMdi *mdi;
48	48	};

Show on old repository browser