Made Blob into Pimpl to better support language bindings

3 files changed, 13 insertions, 13 deletions

diff --git a/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp b/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp
index 4a0ec00..eda4ce8 100644
--- a/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp
+++ b/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp
@@ -373,7 +373,7 @@ void FFMPEGInvoker::openVideo(EncodingContext* ctx, AVFormatContext *oc, AVCodec
 	*((AVPicture *)ctx->frame) = ctx->dst_picture;
 }
 
-void FFMPEGInvoker::writeVideoFrame(EncodingContext* ctx, AVFormatContext *oc, AVStream *st, boost::shared_ptr<Blob> image) {
+void FFMPEGInvoker::writeVideoFrame(EncodingContext* ctx, AVFormatContext *oc, AVStream *st, Blob image) {
 	int ret;
 	AVCodecContext *c = st->codec;
 
@@ -392,14 +392,14 @@ void FFMPEGInvoker::writeVideoFrame(EncodingContext* ctx, AVFormatContext *oc, A
 		}
 
 		uint32_t headerOffset = 0;
-		headerOffset += image->data[10] << 0;
-		headerOffset += image->data[11] << 8;
-		headerOffset += image->data[12] << 16;
-		headerOffset += image->data[13] << 24;
+		headerOffset += image._impl->data[10] << 0;
+		headerOffset += image._impl->data[11] << 8;
+		headerOffset += image._impl->data[12] << 16;
+		headerOffset += image._impl->data[13] << 24;
 
 //		std::cout << headerOffset + (c->width * c->height) << " / " << image->_size << std::endl;
 
-		ret = avpicture_fill(&ctx->src_picture, (uint8_t*)(image->data + headerOffset), BMP_FORMAT, c->width, c->height);
+		ret = avpicture_fill(&ctx->src_picture, (uint8_t*)(image._impl->data + headerOffset), BMP_FORMAT, c->width, c->height);
 		if (ret < 0) {
 			fprintf(stderr,
 			        "Could not fill image from given bitmap\n");
@@ -408,7 +408,7 @@ void FFMPEGInvoker::writeVideoFrame(EncodingContext* ctx, AVFormatContext *oc, A
 		          (const uint8_t * const *)ctx->src_picture.data, ctx->src_picture.linesize,
 		          0, c->height, ctx->dst_picture.data, ctx->dst_picture.linesize);
 	} else {
-		avpicture_fill(&ctx->dst_picture, (uint8_t*)image->data, c->pix_fmt, c->width, c->height);
+		avpicture_fill(&ctx->dst_picture, (uint8_t*)image._impl->data, c->pix_fmt, c->width, c->height);
 	}
 
 	if (oc->oformat->flags & AVFMT_RAWPICTURE) {
diff --git a/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.h b/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.h
index 964681b..81589bb 100644
--- a/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.h
+++ b/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.h
@@ -92,7 +92,7 @@ protected:
 
 	AVStream* addStream(EncodingContext* ctx, AVFormatContext *oc, AVCodec **codec, enum AVCodecID codec_id);
 	void openVideo(EncodingContext* ctx, AVFormatContext *oc, AVCodec *codec, AVStream *st);
-	void writeVideoFrame(EncodingContext* ctx, AVFormatContext *oc, AVStream *st, boost::shared_ptr<Blob> image);
+	void writeVideoFrame(EncodingContext* ctx, AVFormatContext *oc, AVStream *st, Blob image);
 	void closeVideo(EncodingContext* ctx, AVFormatContext *oc, AVStream *st);
 
 	static void run(void*);
diff --git a/src/uscxml/plugins/invoker/smtp/SMTPInvoker.cpp b/src/uscxml/plugins/invoker/smtp/SMTPInvoker.cpp
index 2a974ab..90b777c 100644
--- a/src/uscxml/plugins/invoker/smtp/SMTPInvoker.cpp
+++ b/src/uscxml/plugins/invoker/smtp/SMTPInvoker.cpp
@@ -101,8 +101,8 @@ void SMTPInvoker::getAttachments(std::list<Data> list, std::list<Data>& attachme
 			Data att = data;
 
 			if (!att.hasKey("mimetype")) {
-				if (att["data"].binary && att["data"].binary->mimeType.size() > 0) {
-					att.compound["mimetype"] = Data(att["data"].binary->mimeType, Data::VERBATIM);
+				if (att["data"].binary && att["data"].binary.getMimeType().size() > 0) {
+					att.compound["mimetype"] = Data(att["data"].binary.getMimeType(), Data::VERBATIM);
 				} else {
 					att.compound["mimetype"] = Data("text/plain", Data::VERBATIM);
 				}
@@ -127,8 +127,8 @@ void SMTPInvoker::getAttachments(std::list<Data> list, std::list<Data>& attachme
 
 			att.compound["data"].binary = data.binary;
 
-			if (data.binary->mimeType.size() > 0) {
-				att.compound["mimetype"] = Data(attachments.back()["data"].binary->mimeType, Data::VERBATIM);
+			if (data.binary.getMimeType().size() > 0) {
+				att.compound["mimetype"] = Data(attachments.back()["data"].binary.getMimeType(), Data::VERBATIM);
 			} else {
 				att.compound["mimetype"] = Data("application/octet-stream", Data::VERBATIM);
 			}
@@ -271,7 +271,7 @@ void SMTPInvoker::send(const SendRequest& req) {
 				if (attIter->compound["data"].binary) {
 					contentSS << "Content-Transfer-Encoding: base64";
 					contentSS << "\n\n";
-					contentSS << attIter->compound["data"].binary->base64();
+					contentSS << attIter->compound["data"].binary.base64();
 				} else {
 					contentSS << "Content-Transfer-Encoding: 7Bit";
 					contentSS << "\n\n";