From 4030bb57d8a9c9f3f2e1ba44b6b17492d3c79eaa Mon Sep 17 00:00:00 2001
From: guest <guest@f059d3a0-6783-47b7-97ff-1fe0bbf25129>
Date: Mon, 29 Sep 2008 21:06:20 +0000
Subject: vlcstreamer creates streams now :-), but they're not played back, by
 the client due to suspicious "cannot fill perfill buffer" error msg

git-svn-id: http://manut.eu/svn/yalp/trunk@8 f059d3a0-6783-47b7-97ff-1fe0bbf25129
---
 src/YalpServer/ServerControlImpl.java | 40 +++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'src/YalpServer/ServerControlImpl.java')

diff --git a/src/YalpServer/ServerControlImpl.java b/src/YalpServer/ServerControlImpl.java
index 44984c7..5612e2c 100755
--- a/src/YalpServer/ServerControlImpl.java
+++ b/src/YalpServer/ServerControlImpl.java
@@ -41,6 +41,7 @@ public class ServerControlImpl extends ServerControlInterfacePOA {
 
 	private InitServer srv;
 	private InputPluginHandler inputHandler;
+	private OutputPluginHandler outputHandler;
 
 	private String log4jFile = "log4j_server.conf";
 
@@ -61,6 +62,7 @@ public ServerControlImpl() {
 		logger.debug("init()");
 		srv = _srv;
 		inputHandler = srv.inputHandler;
+		outputHandler = srv.outputHandler;
 	}
 
 /*
@@ -191,9 +193,7 @@ public ServerControlImpl() {
 		error.level = YalpErrorLevel.ERROR_LEVEL_INFO;
 		err.value = error;
 
-		Output out = new Output();
-		out = ctlOutput.value;
-		ctlOutput.value = out;
+		outputHandler.control(ctlOutput, err);
 	}
 
 /*
@@ -221,23 +221,31 @@ public ServerControlImpl() {
 	{
 		logger.debug("registerOutputPlugin()");
 		/* t.b.d. itf handling */
-		System.out.println("registering output plugin: " + info.value.name );
+		logger.info("registering output plugin: " + info.value.name );
+		OutputPluginInterface outputItf;
+
+		try {
+			outputItf = OutputPluginInterfaceHelper.narrow(itf);
+		} catch( Exception e ) {
+			e.printStackTrace();
+			return;
+		}
+
+		OutputPlugin newPlugin = new OutputPlugin(outputItf, info.value);
+
+		PluginInfo inf = new PluginInfo();
+
+		if( newPlugin != null )
+			inf = outputHandler.addPlugin( newPlugin );
+
+		info.value = inf;
+
 		YalpError error = new YalpError();
-		error.msg = "huhu";
-		error.descr = "hihi";
+		error.msg = "plugin registered";
+		error.descr = "";
 		error.code = YalpErrorCode.OK;
 		error.level = YalpErrorLevel.ERROR_LEVEL_INFO;
 		err.value = error;
-		PluginInfo inf = new PluginInfo();
-		inf.id            =	666;
-		inf.name          =	info.value.name;
-		inf.description   =	info.value.description;
-		inf.type          =	info.value.type;
-		inf.supportedTypes=	info.value.supportedTypes;
-		inf.access        =	info.value.access;
-		inf.maxClients    =	info.value.maxClients;
-		inf.actClients    =	info.value.actClients;
-		info.value = inf;
 	}
 
 /*
-- 
cgit v1.2.3