MCVideoClip/MCAudioClip/MCEPS ::import() and hc_import() methods

livecodepanos · livecodepanos · commit 2e146b9eb895 · 2013-09-11T16:51:07.000+01:00
diff --git a/engine/src/aclip.cpp b/engine/src/aclip.cpp
@@ -491,7 +491,7 @@ void MCAudioClip::setlooping(Boolean loop)
 	looping = loop;
 }
 
-Boolean MCAudioClip::import(const char *fname, IO_handle stream)
+Boolean MCAudioClip::import(MCStringRef fname, IO_handle stream)
 {
 	size = (uint4)MCS_fsize(stream);
 	if (size == 0)
@@ -606,11 +606,11 @@ Boolean MCAudioClip::import(const char *fname, IO_handle stream)
 				rate = 11000;
 			}
 	}
-	const char *tname = strrchr(fname, PATH_SEPARATOR);
+	const char *tname = strrchr(MCStringGetCString(fname), PATH_SEPARATOR);
 	if (tname != NULL)
 		tname += 1;
 	else
-		tname = fname;
+		tname = MCStringGetCString(fname);
 	setname_cstring(tname);
 	return True;
 }
diff --git a/engine/src/aclip.h b/engine/src/aclip.h
@@ -102,7 +102,7 @@ class MCAudioClip : public MCObject
 	Boolean issupported();
 	void setdisposable();
 	void setlooping(Boolean loop);
-	Boolean import(const char *fname, IO_handle stream);
+	Boolean import(MCStringRef fname, IO_handle stream);
 	Boolean open_audio();
 	Boolean play();
 	void stop(Boolean abort);
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -751,13 +751,13 @@ IO_stat MCDispatch::doreadfile(const char *openpath, const char *inname, IO_hand
 		}
 		else
 		{
-			char *tname = strclone(inname);
+			MCAutoStringRef tname;
+            /* UNCHECKED */ MCStringCreateWithCString(inname, &tname);
 			
 			// MW-2008-06-12: [[ Bug 6476 ]] Media won't open HC stacks
-			if (!MCdispatcher->cut(True) || hc_import(tname, stream, sptr) != IO_NORMAL)
+			if (!MCdispatcher->cut(True) || hc_import(*tname, stream, sptr) != IO_NORMAL)
 			{
 				MCresult->sets("file is not a stack");
-				delete tname;
 				return IO_ERROR;
 			}
 		}
diff --git a/engine/src/eps.cpp b/engine/src/eps.cpp
@@ -721,23 +721,20 @@ void MCEPS::resetscale()
 		yscale = xscale;
 	}
 }
-/* WRAPPER */ bool MCEPS::import(MCStringRef p_filename, IO_handle p_stream)
-{
-	return True == import(MCStringGetCString(p_filename), p_stream);
-}
-Boolean MCEPS::import(const char *fname, IO_handle stream)
+
+Boolean MCEPS::import(MCStringRef fname, IO_handle stream)
 {
 	size = (uint4)MCS_fsize(stream);
 	delete postscript;
 	postscript = new char[size + 1];
 	if (IO_read(postscript, size, stream) != IO_NORMAL)
 		return False;
 	postscript[size] = '\0';
-	const char *tname = strrchr(fname, PATH_SEPARATOR);
+	const char *tname = strrchr(MCStringGetCString(fname), PATH_SEPARATOR);
 	if (tname != NULL)
 		tname += 1;
 	else
-		tname = fname;
+		tname = MCStringGetCString(fname);
 	setname_cstring(tname);
 	setextents();
 	rect.width = (uint2)(ex * xscale / xf);
diff --git a/engine/src/eps.h b/engine/src/eps.h
@@ -67,7 +67,6 @@ class MCEPS : public MCControl
 	// Eps functions
 	void setextents();
 	void resetscale();
-	bool import(MCStringRef p_filename, IO_handle p_stream);
-	Boolean import(const char *fname, IO_handle stream);
+	Boolean import(MCStringRef fname, IO_handle stream);
 };
 #endif
diff --git a/engine/src/exec-interface.cpp b/engine/src/exec-interface.cpp
@@ -3372,7 +3372,7 @@ void MCInterfaceExecImportAudioClip(MCExecContext& ctxt, MCStringRef p_filename)
 	if (t_stream != NULL)
 	{
 		MCAudioClip *aptr = new MCAudioClip;
-		if (!aptr->import(MCStringGetCString(p_filename), t_stream))
+		if (!aptr->import(p_filename, t_stream))
 		{
 			ctxt . LegacyThrow(EE_IMPORT_CANTREAD);
 			delete aptr;
@@ -3398,7 +3398,7 @@ void MCInterfaceExecImportVideoClip(MCExecContext& ctxt, MCStringRef p_filename)
 	if (t_stream != NULL)
 	{
 		MCVideoClip *vptr = new MCVideoClip;
-		if (!vptr->import(MCStringGetCString(p_filename), t_stream))
+		if (!vptr->import(p_filename, t_stream))
 		{
 			ctxt . LegacyThrow(EE_IMPORT_CANTREAD);
 			delete vptr;
diff --git a/engine/src/exec-multimedia.cpp b/engine/src/exec-multimedia.cpp
@@ -485,7 +485,7 @@ void MCMultimediaExecPlayAudioClip(MCExecContext& ctxt, MCStack *p_target, int p
 		}
 		MCacptr = new MCAudioClip;
 		MCacptr->setdisposable();
-		if (!MCacptr->import(MCStringGetCString(p_clip), stream))
+		if (!MCacptr->import(p_clip, stream))
 		{
 			MCS_close(stream);
 			MCresult->sets("error reading audioClip");
diff --git a/engine/src/hc.cpp b/engine/src/hc.cpp
@@ -2405,18 +2405,14 @@ MCStack *MCHcstak::build()
 	return sptr;
 }
 
-/* WRAPPER */ IO_stat hc_import(MCStringRef p_name, IO_handle p_stream, MCStack *&p_stack)
-{
-	return hc_import(MCStringGetCString(p_name), p_stream, *&p_stack);
-}
 
-IO_stat hc_import(const char *name, IO_handle stream, MCStack *&sptr)
+IO_stat hc_import(MCStringRef name, IO_handle stream, MCStack *&sptr)
 {
 	maxid = 0;
 	MCValueAssign(MChcstat, kMCEmptyString);
 
-	MCHcstak *hcstak = new MCHcstak(strclone(name));
-	hcstat_append("Loading stack %s...", name);
+	MCHcstak *hcstak = new MCHcstak(strdup(MCStringGetCString(name)));
+	hcstat_append("Loading stack %@...", name);
 	uint2 startlen = MCStringGetLength(MChcstat);
 	IO_stat stat;
 	if ((stat = hcstak->read(stream)) == IO_NORMAL)
diff --git a/engine/src/hc.h b/engine/src/hc.h
@@ -403,6 +403,5 @@ class MCHcstak
 #endif
 };
 
-extern IO_stat hc_import(MCStringRef p_name, IO_handle p_stream, MCStack *&p_stack);
-extern IO_stat hc_import(const char *name, IO_handle stream, MCStack *&sptr);
+extern IO_stat hc_import(MCStringRef p_name, IO_handle p_stream, MCStack *&p_sptr);
 
diff --git a/engine/src/stacke.cpp b/engine/src/stacke.cpp
@@ -252,7 +252,7 @@ void MCStack::effectrect(const MCRectangle& p_area, Boolean& r_abort)
 				{
 					acptr = new MCAudioClip;
 					acptr->setdisposable();
-					if (!acptr->import(t_effects->sound, stream))
+					if (!acptr->import(*t_sound, stream))
 					{
 						delete acptr;
 						acptr = NULL;
diff --git a/engine/src/vclip.cpp b/engine/src/vclip.cpp
@@ -216,13 +216,13 @@ char *MCVideoClip::getfile()
 	return NULL;
 }
 
-Boolean MCVideoClip::import(const char *fname, IO_handle fstream)
+Boolean MCVideoClip::import(MCStringRef fname, IO_handle fstream)
 {
-	const char *tname = strrchr(fname, PATH_SEPARATOR);
+	const char *tname = strrchr(MCStringGetCString(fname), PATH_SEPARATOR);
 	if (tname != NULL)
 		tname += 1;
 	else
-		tname = fname;
+		tname = MCStringGetCString(fname);
 	setname_cstring(tname);
 	size = (uint4)MCS_fsize(fstream);
 	frames = new uint1[size];
diff --git a/engine/src/vclip.h b/engine/src/vclip.h
@@ -53,7 +53,7 @@ class MCVideoClip : public MCObject
 	{
 		return scale;
 	}
-	Boolean import(const char *fname, IO_handle stream);
+	Boolean import(MCStringRef fname, IO_handle stream);
 	
 	IO_stat load(IO_handle stream, const char *version);
 	IO_stat extendedload(MCObjectInputStream& p_stream, const char *p_version, uint4 p_length);

Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ void MCAudioClip::setlooping(Boolean loop)`
`491`	`491`	`looping = loop;`
`492`	`492`	`}`
`493`	`493`
`494`		`-Boolean MCAudioClip::import(const char *fname, IO_handle stream)`
	`494`	`+Boolean MCAudioClip::import(MCStringRef fname, IO_handle stream)`
`495`	`495`	`{`
`496`	`496`	`size = (uint4)MCS_fsize(stream);`
`497`	`497`	`if (size == 0)`
`@@ -606,11 +606,11 @@ Boolean MCAudioClip::import(const char *fname, IO_handle stream)`
`606`	`606`	`rate = 11000;`
`607`	`607`	`}`
`608`	`608`	`}`
`609`		`- const char *tname = strrchr(fname, PATH_SEPARATOR);`
	`609`	`+ const char *tname = strrchr(MCStringGetCString(fname), PATH_SEPARATOR);`
`610`	`610`	`if (tname != NULL)`
`611`	`611`	`tname += 1;`
`612`	`612`	`else`
`613`		`- tname = fname;`
	`613`	`+ tname = MCStringGetCString(fname);`
`614`	`614`	`setname_cstring(tname);`
`615`	`615`	`return True;`
`616`	`616`	`}`
Original file line number	Diff line number	Diff line change
`@@ -751,13 +751,13 @@ IO_stat MCDispatch::doreadfile(const char openpath, const char inname, IO_hand`
`751`	`751`	`}`
`752`	`752`	`else`
`753`	`753`	`{`
`754`		`- char *tname = strclone(inname);`
	`754`	`+ MCAutoStringRef tname;`
	`755`	`+ /* UNCHECKED */ MCStringCreateWithCString(inname, &tname);`
`755`	`756`
`756`	`757`	`// MW-2008-06-12: [[ Bug 6476 ]] Media won't open HC stacks`
`757`		`- if (!MCdispatcher->cut(True) \|\| hc_import(tname, stream, sptr) != IO_NORMAL)`
	`758`	`+ if (!MCdispatcher->cut(True) \|\| hc_import(*tname, stream, sptr) != IO_NORMAL)`
`758`	`759`	`{`
`759`	`760`	`MCresult->sets("file is not a stack");`
`760`		`- delete tname;`
`761`	`761`	`return IO_ERROR;`
`762`	`762`	`}`
`763`	`763`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3372,7 +3372,7 @@ void MCInterfaceExecImportAudioClip(MCExecContext& ctxt, MCStringRef p_filename)`
`3372`	`3372`	`if (t_stream != NULL)`
`3373`	`3373`	`{`
`3374`	`3374`	`MCAudioClip *aptr = new MCAudioClip;`
`3375`		`- if (!aptr->import(MCStringGetCString(p_filename), t_stream))`
	`3375`	`+ if (!aptr->import(p_filename, t_stream))`
`3376`	`3376`	`{`
`3377`	`3377`	`ctxt . LegacyThrow(EE_IMPORT_CANTREAD);`
`3378`	`3378`	`delete aptr;`
`@@ -3398,7 +3398,7 @@ void MCInterfaceExecImportVideoClip(MCExecContext& ctxt, MCStringRef p_filename)`
`3398`	`3398`	`if (t_stream != NULL)`
`3399`	`3399`	`{`
`3400`	`3400`	`MCVideoClip *vptr = new MCVideoClip;`
`3401`		`- if (!vptr->import(MCStringGetCString(p_filename), t_stream))`
	`3401`	`+ if (!vptr->import(p_filename, t_stream))`
`3402`	`3402`	`{`
`3403`	`3403`	`ctxt . LegacyThrow(EE_IMPORT_CANTREAD);`
`3404`	`3404`	`delete vptr;`
Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ void MCMultimediaExecPlayAudioClip(MCExecContext& ctxt, MCStack *p_target, int p`
`485`	`485`	`}`
`486`	`486`	`MCacptr = new MCAudioClip;`
`487`	`487`	`MCacptr->setdisposable();`
`488`		`- if (!MCacptr->import(MCStringGetCString(p_clip), stream))`
	`488`	`+ if (!MCacptr->import(p_clip, stream))`
`489`	`489`	`{`
`490`	`490`	`MCS_close(stream);`
`491`	`491`	`MCresult->sets("error reading audioClip");`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ void MCStack::effectrect(const MCRectangle& p_area, Boolean& r_abort)`
`252`	`252`	`{`
`253`	`253`	`acptr = new MCAudioClip;`
`254`	`254`	`acptr->setdisposable();`
`255`		`- if (!acptr->import(t_effects->sound, stream))`
	`255`	`+ if (!acptr->import(*t_sound, stream))`
`256`	`256`	`{`
`257`	`257`	`delete acptr;`
`258`	`258`	`acptr = NULL;`