svnno****@sourc*****
svnno****@sourc*****
2008年 8月 11日 (月) 18:46:02 JST
ForkRevision: 39
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=swfed&view=rev&rev=39
Author: yoya
Date: 2008-08-11 18:46:02 +0900 (Mon, 11 Aug 2008)
Log Message:
-----------
getMP3Data を getSoundDate に変更
Modified Paths:
--------------
src/php_swfed.h
src/swf_object.c
src/swf_object.h
src/swf_tag.c
src/swf_tag.h
src/swf_tag_sound.c
src/swf_tag_sound.h
src/swfed.c
Added Paths:
-----------
sample/swfgetsounddata.phps
Removed Paths:
-------------
sample/swfgetmp3data.phps
-------------- next part --------------
Deleted: sample/swfgetmp3data.phps
===================================================================
--- sample/swfgetmp3data.phps 2008-08-11 09:37:56 UTC (rev 38)
+++ sample/swfgetmp3data.phps 2008-08-11 09:46:02 UTC (rev 39)
@@ -1,15 +0,0 @@
-<?php
-
-if ($argc != 3) {
- fprintf(STDERR, "Usage: swfgetmp3data <swf_file> <sound_id>\n");
- exit(1);
-}
-
-$swf_filename = $argv[1];
-$sound_id = $argv[2];
-$swfdata = file_get_contents($swf_filename);
-
-$obj = new SWFEditor();
-$obj->input($swfdata);
-
-echo $obj->getMP3Data($sound_id);
Copied: sample/swfgetsounddata.phps (from rev 37, sample/swfgetmp3data.phps)
===================================================================
--- sample/swfgetsounddata.phps (rev 0)
+++ sample/swfgetsounddata.phps 2008-08-11 09:46:02 UTC (rev 39)
@@ -0,0 +1,15 @@
+<?php
+
+if ($argc != 3) {
+ fprintf(STDERR, "Usage: swfgetsounddata <swf_file> <sound_id>\n");
+ exit(1);
+}
+
+$swf_filename = $argv[1];
+$sound_id = $argv[2];
+$swfdata = file_get_contents($swf_filename);
+
+$obj = new SWFEditor();
+$obj->input($swfdata);
+
+echo $obj->getSoundData($sound_id);
Modified: src/php_swfed.h
===================================================================
--- src/php_swfed.h 2008-08-11 09:37:56 UTC (rev 38)
+++ src/php_swfed.h 2008-08-11 09:46:02 UTC (rev 39)
@@ -58,7 +58,7 @@
PHP_METHOD(swfed, replaceJpegData);
PHP_METHOD(swfed, getPNGData);
PHP_METHOD(swfed, replacePNGData);
-PHP_METHOD(swfed, getMP3Data);
+PHP_METHOD(swfed, getSoundData);
PHP_METHOD(swfed, getEditString);
PHP_METHOD(swfed, replaceEditString);
PHP_METHOD(swfed, getActionData);
Modified: src/swf_object.c
===================================================================
--- src/swf_object.c 2008-08-11 09:37:56 UTC (rev 38)
+++ src/swf_object.c 2008-08-11 09:46:02 UTC (rev 39)
@@ -299,12 +299,12 @@
}
unsigned char *
-swf_object_get_mp3data(swf_object_t *swf, unsigned long *length, int sound_id) {
+swf_object_get_sounddata(swf_object_t *swf, unsigned long *length, int sound_id) {
swf_tag_t *tag;
unsigned char *data = NULL;
*length = 0;
if (swf == NULL) {
- fprintf(stderr, "swf_object_get_mp3data: swf == NULL\n");
+ fprintf(stderr, "swf_object_get_sounddata: swf == NULL\n");
return NULL;
}
for (tag = swf->tag; tag; tag = tag->next) {
@@ -312,7 +312,7 @@
if (tag->tag != 14) {
continue;
}
- data = swf_tag_get_mp3_data(tag, length, sound_id);
+ data = swf_tag_get_sound_data(tag, length, sound_id);
if (data) {
break;
}
Modified: src/swf_object.h
===================================================================
--- src/swf_object.h 2008-08-11 09:37:56 UTC (rev 38)
+++ src/swf_object.h 2008-08-11 09:46:02 UTC (rev 39)
@@ -36,7 +36,7 @@
extern int swf_object_replace_pngdata(swf_object_t *swf, int image_id,
unsigned char *png_data,
unsigned long png_data_len);
-extern unsigned char *swf_object_get_mp3data(swf_object_t *swf, unsigned long *length, int sound_id);
+extern unsigned char *swf_object_get_sounddata(swf_object_t *swf, unsigned long *length, int sound_id);
extern char *swf_object_get_editstring(swf_object_t *swf,
char *variable_name,
int variable_name_len);
Modified: src/swf_tag.c
===================================================================
--- src/swf_tag.c 2008-08-11 09:37:56 UTC (rev 38)
+++ src/swf_tag.c 2008-08-11 09:46:02 UTC (rev 39)
@@ -410,11 +410,11 @@
}
unsigned char *
-swf_tag_get_mp3_data(swf_tag_t *tag, unsigned long *length, int sound_id) {
+swf_tag_get_sound_data(swf_tag_t *tag, unsigned long *length, int sound_id) {
swf_tag_info_t *tag_info;
*length = 0;
if (tag == NULL) {
- fprintf(stderr, "swf_tag_get_mp3_data: tag == NULL\n");
+ fprintf(stderr, "swf_tag_get_sound_data: tag == NULL\n");
return NULL;
}
tag_info = get_swf_tag_info(tag->tag);
@@ -425,10 +425,10 @@
swf_tag_create_detail(tag, NULL);
}
if (! tag->detail) {
- fprintf(stderr, "swf_tag_get_mp3_data: Can't create tag detail\n");
+ fprintf(stderr, "swf_tag_get_sound_data: Can't create tag detail\n");
return NULL;
}
- return swf_tag_sound_get_mp3_data(tag->detail, length, sound_id);
+ return swf_tag_sound_get_sound_data(tag->detail, length, sound_id);
}
Modified: src/swf_tag.h
===================================================================
--- src/swf_tag.h 2008-08-11 09:37:56 UTC (rev 38)
+++ src/swf_tag.h 2008-08-11 09:46:02 UTC (rev 39)
@@ -65,9 +65,9 @@
unsigned char *png_data,
unsigned long png_data_len);
/* sound */
-extern unsigned char *swf_tag_get_mp3_data(swf_tag_t *tag,
- unsigned long *length,
- int sound_id);
+extern unsigned char *swf_tag_get_sound_data(swf_tag_t *tag,
+ unsigned long *length,
+ int sound_id);
/* edit text */
extern char *swf_tag_get_edit_string(swf_tag_t *tag,
Modified: src/swf_tag_sound.c
===================================================================
--- src/swf_tag_sound.c 2008-08-11 09:37:56 UTC (rev 38)
+++ src/swf_tag_sound.c 2008-08-11 09:46:02 UTC (rev 39)
@@ -153,13 +153,13 @@
}
unsigned char *
-swf_tag_sound_get_mp3_data(void *detail, unsigned long *length,
+swf_tag_sound_get_sound_data(void *detail, unsigned long *length,
int sound_id) {
swf_tag_sound_detail_t *swf_tag_sound = (swf_tag_sound_detail_t *) detail;
unsigned char *data;
*length = 0;
if (detail == NULL) {
- fprintf(stderr, "swf_tag_sound_get_mp3_data: detail == NULL\n");
+ fprintf(stderr, "swf_tag_sound_get_sound_data: detail == NULL\n");
return NULL;
}
if (swf_tag_sound->sound_id != sound_id) {
Modified: src/swf_tag_sound.h
===================================================================
--- src/swf_tag_sound.h 2008-08-11 09:37:56 UTC (rev 38)
+++ src/swf_tag_sound.h 2008-08-11 09:46:02 UTC (rev 39)
@@ -37,7 +37,7 @@
struct swf_object_ *swf);
extern void swf_tag_sound_destroy_detail(void *detail);
-extern unsigned char *swf_tag_sound_get_mp3_data(void *detail, unsigned long *length,
+extern unsigned char *swf_tag_sound_get_sound_data(void *detail, unsigned long *length,
int sound_id);
extern int swf_tag_sound_replace_mp3_data(void *detail, int sound_id,
unsigned char *mp3_data,
Modified: src/swfed.c
===================================================================
--- src/swfed.c 2008-08-11 09:37:56 UTC (rev 38)
+++ src/swfed.c 2008-08-11 09:46:02 UTC (rev 39)
@@ -62,7 +62,7 @@
PHP_ME(swfed, replaceJpegData, NULL, 0)
PHP_ME(swfed, getPNGData, NULL, 0)
PHP_ME(swfed, replacePNGData, NULL, 0)
- PHP_ME(swfed, getMP3Data, NULL, 0)
+ PHP_ME(swfed, getSoundData, NULL, 0)
PHP_ME(swfed, getEditString, NULL, 0)
PHP_ME(swfed, replaceEditString, NULL, 0)
PHP_ME(swfed, getActionData, NULL, 0)
@@ -570,7 +570,7 @@
RETURN_TRUE;
}
-PHP_METHOD(swfed, getMP3Data) {
+PHP_METHOD(swfed, getSoundData) {
unsigned long sound_id = 0;
unsigned long len = 0;
unsigned char *data, *new_buff;
@@ -581,13 +581,13 @@
RETURN_FALSE;
}
swf = get_swf_object(getThis());
- data = swf_object_get_mp3data(swf, &len, sound_id);
+ data = swf_object_get_sounddata(swf, &len, sound_id);
if (data == NULL) {
RETURN_FALSE;
}
new_buff = emalloc(len);
if (new_buff == NULL) {
- fprintf(stderr, "getMP3Data: Can't emalloc new_buff\n");
+ fprintf(stderr, "getSoundData: Can't emalloc new_buff\n");
free(data);
RETURN_FALSE;
}