Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix build of custom server example.

Signed-off-by: Dan Dennedy <dan@dennedy.org>
  • Loading branch information...
commit 437e1fc59d8b0dddb9a0faf1e47d611f33a5f4e6 1 parent 4a77ed4
@ddennedy ddennedy authored
Showing with 12 additions and 15 deletions.
  1. +4 −9 src/examples/Makefile
  2. +8 −6 src/examples/server.cpp
View
13 src/examples/Makefile
@@ -1,21 +1,16 @@
-include ../config.mak
+include ../../config.mak
-CXXFLAGS+=-Wall -g `pkg-config mlt-framework --cflags` -I ../src
-LDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `pkg-config mlt-framework --libs`
+CXXFLAGS += -Wall -g -I.. -I../melted++ `pkg-config mlt++ --cflags`
+LDFLAGS += -L../melted++ -lmelted++ -L../melted -lmelted -L../mvcp -lmvcp `pkg-config mlt++ --libs`
CC=c++
-all: play server
-
-play: play.o
-
-play.o: play.cpp
+all: server
server: server.o
server.o: server.cpp
clean:
- $(RM) play play.o
$(RM) server server.o
distclean: clean
View
14 src/examples/server.cpp
@@ -5,9 +5,11 @@
using namespace std;
#include <Mlt.h>
+#include <MltMelted.h>
+#include <MltResponse.h>
using namespace Mlt;
-class Custom : public Miracle
+class Custom : public Melted
{
private:
Event *event;
@@ -15,10 +17,10 @@ class Custom : public Miracle
public:
Custom( char *name = "Custom", int port = 5290, char *config = NULL ) :
- Miracle( name, port, config ),
+ Melted( name, port, config ),
event( NULL )
{
- // Ensure that we receive the westley document before it's deserialised
+ // Ensure that we receive the MLT XML document before it's deserialised
set( "push-parser-off", 1 );
}
@@ -27,11 +29,11 @@ class Custom : public Miracle
delete event;
}
- // Optional step - receive the westley document and do something with it
+ // Optional step - receive the MLT XML document and do something with it
Response *received( char *command, char *document )
{
cerr << document << endl;
- Producer producer( profile, "westley-xml", document );
+ Producer producer( profile, "xml-string", document );
return push( command, &producer );
}
@@ -75,7 +77,7 @@ class Custom : public Miracle
else
{
// Use the default command processing
- response = Miracle::execute( command );
+ response = Melted::execute( command );
}
// If no event exists and the first unit has been added...
Please sign in to comment.
Something went wrong with that request. Please try again.