deinits

2 files changed, 21 insertions, 10 deletions

diff --git a/examples/example2.csd b/examples/example2.csd
index 0d1314e..17af34c 100644
--- a/examples/example2.csd
+++ b/examples/example2.csd
@@ -24,8 +24,9 @@ instr hello
 endin
 
 instr run
-	gishout shoutopen "10.0.0.1", 8000, "", "stream_my_butt", "/csound.mp3"
+	gishout shoutinit "10.0.0.1", 8000, "", "stream_my_butt", "/csound.mp3"
 	gifnhello ftts "hello from sea sound", 440
+	shoutopen gishout
 	schedule "hello", 0, 5
 endin
 
diff --git a/src/opcodes.cpp b/src/opcodes.cpp
index 31a1047..9e95508 100644
--- a/src/opcodes.cpp
+++ b/src/opcodes.cpp
@@ -120,11 +120,23 @@ struct shoutinit : csnd::Plugin<1, 5> {
 	}
 };
 
+void close_session(ShoutSession* session) {
+	if (session->open) {
+		shout_close(session->shout);
+		session->open = false;
+	}
+	if (session->meta != NULL) {
+		shout_metadata_free(session->meta);
+		session->meta = NULL;
+	}
+}
+
 struct shoutopen : csnd::InPlug<1> {
 	ARGO = "";
 	ARGI = "i";
+	ShoutSession* session;
 	int init() {
-		ShoutSession* session;
+		csound->plugin_deinit(this);
 		if (!(session = getHandle<ShoutSession>(csound, args[0], handleName))) {
 			return csound->init_error("Invalid shout session handle");
 		}
@@ -138,6 +150,11 @@ struct shoutopen : csnd::InPlug<1> {
 		session->open = true;
 		return OK;
 	}
+
+	int deinit() {
+		close_session(session);
+		return OK;
+	}
 };
 
 struct shoutclose : csnd::InPlug<1> {
@@ -148,14 +165,7 @@ struct shoutclose : csnd::InPlug<1> {
 		if (!(session = getHandle<ShoutSession>(csound, args[0], handleName))) {
 			return csound->init_error("Invalid shout session handle");
 		}
-		if (session->open) {
-			shout_close(session->shout);
-			session->open = false;
-		}
-		if (session->meta != NULL) {
-			shout_metadata_free(session->meta);
-			session->meta = NULL;
-		}
+		close_session(session);
 		return OK;
 	}
 };