add first code bits of new alsa encoder

5 files changed, 1170 insertions, 0 deletions

diff --git a/src/AlsaDabplus.cpp b/src/AlsaDabplus.cpp
new file mode 100644
index 0000000..e94f00a
--- /dev/null
+++ b/src/AlsaDabplus.cpp
@@ -0,0 +1,252 @@
+/* ------------------------------------------------------------------
+ * Copyright (C) 2011 Martin Storsjo
+ * Copyright (C) 2013,2014 Matthias P. Braendli
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ * -------------------------------------------------------------------
+ */
+
+#include "AlsaInput.h"
+#include "SampleQueue.h"
+#include "zmq.hpp"
+
+#include <string>
+#include <getopt.h>
+#include <cstdio>
+#include <stdint.h>
+
+#include "libAACenc/include/aacenc_lib.h"
+
+using namespace std;
+
+void usage(const char* name) {
+    fprintf(stderr, "%s [OPTION...]\n", name);
+    fprintf(stderr,
+"     -b, --bitrate={ 8, 16, ..., 192 }    Output bitrate in kbps. Must be 8 multiple.\n"
+//"   -d, --data=FILENAME                  Set data filename.\n"
+//"   -g, --fs-bug                         Turn on FS bug mitigation.\n"
+//"   -i, --input=FILENAME                 Input filename (default: stdin).\n"
+"     -o, --output=URI                     Output zmq uri. (e.g. 'tcp://*:9000')\n"
+"     -a, --afterburner                    Turn on AAC encoder quality increaser.\n"
+//"   -m, --message                        Turn on AAC frame messages.\n"
+//"   -p, --pad=BYTES                      Set PAD size in bytes.\n"
+//"   -f, --format={ wav, raw }            Set input file format (default: wav).\n"
+"     -d, --device=alsa_device             Set ALSA input device (default: \"default\").\n"
+"     -c, --channels={ 1, 2 }              Nb of input channels for raw input (default: 2).\n"
+"     -r, --rate={ 32000, 48000 }          Sample rate for raw input (default: 48000).\n"
+//"   -t, --type=TYPE                      Set data type (dls|pad|packet|dg).\n"
+//"   -v, --verbose=LEVEL                  Set verbosity level.\n"
+//"   -V, --version                        Print version and exit.\n"
+//"   --mi=[ 0, ... ]                      Set AAC frame messages interval in milliseconds.\n"
+//"   --ma=[ 0, ... ]                      Set AAC frame messages attack time in milliseconds.\n"
+//"   -l, --lp                             Set frame size to 1024 instead of 960.\n"
+"\n"
+"Only the tcp:// zeromq transport has been tested until now.\n"
+
+);
+
+}
+
+int prepare_aac_encoder(
+        HANDLE_AACENCODER *encoder,
+        int subchannel_index,
+        int channels,
+        int sample_rate,
+        int afterburner)
+{
+    HANDLE_AACENCODER handle = *encoder;
+
+    int aot = AOT_DABPLUS_AAC_LC;
+
+    CHANNEL_MODE mode;
+    switch (channels) {
+        case 1: mode = MODE_1; break;
+        case 2: mode = MODE_2; break;
+        default:
+                fprintf(stderr, "Unsupported channels number %d\n", channels);
+                return 1;
+    }
+
+
+    if (aacEncOpen(&handle, 0x01|0x02|0x04, channels) != AACENC_OK) {
+        fprintf(stderr, "Unable to open encoder\n");
+        return 1;
+    }
+
+
+    if(channels == 2 && subchannel_index <= 6)
+        aot = AOT_DABPLUS_PS;
+    else if((channels == 1 && subchannel_index <= 8) || subchannel_index <= 10)
+        aot = AOT_DABPLUS_SBR;
+
+    fprintf(stderr, "Using %d subchannels. AAC type: %s%s%s. channels=%d, sample_rate=%d\n",
+            subchannel_index,
+            aot == AOT_DABPLUS_PS ? "HE-AAC v2" : "",
+            aot == AOT_DABPLUS_SBR ? "HE-AAC" : "",
+            aot == AOT_DABPLUS_AAC_LC ? "AAC-LC" : "",
+            channels, sample_rate);
+
+    if (aacEncoder_SetParam(handle, AACENC_AOT, aot) != AACENC_OK) {
+        fprintf(stderr, "Unable to set the AOT\n");
+        return 1;
+    }
+    if (aacEncoder_SetParam(handle, AACENC_SAMPLERATE, sample_rate) != AACENC_OK) {
+        fprintf(stderr, "Unable to set the sample rate\n");
+        return 1;
+    }
+    if (aacEncoder_SetParam(handle, AACENC_CHANNELMODE, mode) != AACENC_OK) {
+        fprintf(stderr, "Unable to set the channel mode\n");
+        return 1;
+    }
+    if (aacEncoder_SetParam(handle, AACENC_CHANNELORDER, 1) != AACENC_OK) {
+        fprintf(stderr, "Unable to set the wav channel order\n");
+        return 1;
+    }
+    if (aacEncoder_SetParam(handle, AACENC_GRANULE_LENGTH, 960) != AACENC_OK) {
+        fprintf(stderr, "Unable to set the granule length\n");
+        return 1;
+    }
+    if (aacEncoder_SetParam(handle, AACENC_TRANSMUX, TT_DABPLUS) != AACENC_OK) {
+        fprintf(stderr, "Unable to set the RAW transmux\n");
+        return 1;
+    }
+
+    /*if (aacEncoder_SetParam(handle, AACENC_BITRATEMODE, 7 *AACENC_BR_MODE_SFR*)
+     * != AACENC_OK) {
+        fprintf(stderr, "Unable to set the bitrate mode\n");
+        return 1;
+    }*/
+
+
+    fprintf(stderr, "AAC bitrate set to: %d\n", subchannel_index*8000);
+    if (aacEncoder_SetParam(handle, AACENC_BITRATE, subchannel_index*8000) != AACENC_OK) {
+        fprintf(stderr, "Unable to set the bitrate\n");
+        return 1;
+    }
+    if (aacEncoder_SetParam(handle, AACENC_AFTERBURNER, afterburner) != AACENC_OK) {
+        fprintf(stderr, "Unable to set the afterburner mode\n");
+        return 1;
+    }
+    if (aacEncEncode(handle, NULL, NULL, NULL, NULL) != AACENC_OK) {
+        fprintf(stderr, "Unable to initialize the encoder\n");
+        return 1;
+    }
+    return 0;
+}
+
+
+#define no_argument 0
+#define required_argument 1
+#define optional_argument 2
+
+int main(int argc, char *argv[]) {
+    int subchannel_index = 8; //64kbps subchannel
+    int ch=0;
+    int err;
+    const char *alsa_device = "default";
+    const char *outuri = NULL;
+    int sample_rate=48000, channels=2;
+    const int bytes_per_sample = 2;
+    void *rs_handler = NULL;
+    int afterburner = 0;
+    HANDLE_AACENCODER handle;
+    AACENC_InfoStruct info = { 0 };
+
+    const struct option longopts[] = {
+        {"bitrate",     required_argument,  0, 'b'},
+        {"output",      required_argument,  0, 'o'},
+        {"device",      required_argument,  0, 'd'},
+        {"rate",        required_argument,  0, 'r'},
+        {"channels",    required_argument,  0, 'c'},
+        {"afterburner", no_argument,        0, 'a'},
+        {"help",        no_argument,        0, 'h'},
+        {0,0,0,0},
+    };
+
+    int index;
+    while(ch != -1) {
+        ch = getopt_long(argc, argv, "hab:c:o:r:d:", longopts, &index);
+        switch (ch) {
+        case 'd':
+            alsa_device = optarg;
+            break;
+        case 'a':
+            afterburner = 1;
+            break;
+        case 'b':
+            subchannel_index = atoi(optarg) / 8;
+            break;
+        case 'c':
+            channels = atoi(optarg);
+            break;
+        case 'r':
+            sample_rate = atoi(optarg);
+            break;
+        case 'o':
+            outuri = optarg;
+            break;
+        case '?':
+        case 'h':
+            usage(argv[0]);
+            return 1;
+        }
+    }
+
+    if(subchannel_index < 1 || subchannel_index > 24) {
+        fprintf(stderr, "Bad subchannels number: %d, try other bitrate.\n",
+                subchannel_index);
+        return 1;
+    }
+
+    fprintf(stderr, "Setting up ZeroMQ socket\n");
+    if (!outuri) {
+        fprintf(stderr, "ZeroMQ output URI not defined\n");
+        return 1;
+    }
+
+    zmq::context_t zmq_ctx;
+    zmq::socket_t zmq_sock(zmq_ctx, ZMQ_PUB);
+    zmq_sock.connect(outuri);
+
+    HANDLE_AACENCODER encoder;
+
+    if (prepare_aac_encoder(&encoder, subchannel_index, channels,
+                sample_rate, afterburner) != 0) {
+        fprintf(stderr, "Encoder preparation failed\n");
+        return 2;
+    }
+
+    if (aacEncInfo(handle, &info) != AACENC_OK) {
+        fprintf(stderr, "Unable to get the encoder info\n");
+        return 1;
+    }
+
+    fprintf(stderr, "DAB+ Encoding: framelen=%d\n", info.frameLength);
+
+    // Each DAB+ frame will need input_size audio bytes
+    int input_size = channels * bytes_per_sample * info.frameLength;
+    uint8_t input_buf[input_size];
+
+    int max_size = input_size + NUM_SAMPLES_PER_CALL;
+
+    SampleQueue<uint8_t> queue(BYTES_PER_SAMPLE, channels, max_size);
+
+    AlsaInput alsa_in(alsa_device, channels, sample_rate, queue);
+
+    if (alsa_in.prepare() != 0) {
+        fprintf(stderr, "Alsa preparation failed\n");
+        return 1;
+    }
+
+
diff --git a/src/AlsaInput.cpp b/src/AlsaInput.cpp
new file mode 100644
index 0000000..4c141a1
--- /dev/null
+++ b/src/AlsaInput.cpp
@@ -0,0 +1,139 @@
+/* ------------------------------------------------------------------
+ * Copyright (C) 2011 Martin Storsjo
+ * Copyright (C) 2013,2014 Matthias P. Braendli
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ * -------------------------------------------------------------------
+ */
+
+#include <cstdio>
+#include <cstdint>
+#include <string>
+
+#include <alsa/asoundlib.h>
+
+#include "AlsaInput.h"
+
+using namespace std;
+
+int AlsaInput::prepare()
+{
+    int err;
+    snd_pcm_hw_params_t *hw_params;
+
+    fprintf(stderr, "Initialising ALSA...\n");
+
+    const int open_mode = 0; //|= SND_PCM_NONBLOCK;
+
+    if ((err = snd_pcm_open(&m_alsa_handle, alsa_dev,
+                    SND_PCM_STREAM_CAPTURE, open_mode)) < 0) {
+        fprintf (stderr, "cannot open audio device %s (%s)\n",
+                alsa_dev, snd_strerror(err));
+        return 1;
+    }
+
+    if ((err = snd_pcm_hw_params_malloc(&hw_params)) < 0) {
+        fprintf (stderr, "cannot allocate hardware parameter structure (%s)\n",
+                snd_strerror(err));
+        return 1;
+    }
+
+    if ((err = snd_pcm_hw_params_any(m_alsa_handle, hw_params)) < 0) {
+        fprintf (stderr, "cannot initialize hardware parameter structure (%s)\n",
+                snd_strerror(err));
+        return 1;
+    }
+
+    if ((err = snd_pcm_hw_params_set_access(m_alsa_handle, hw_params,
+                    SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
+        fprintf (stderr, "cannot set access type (%s)\n",
+                snd_strerror(err));
+        return 1;
+    }
+
+    if ((err = snd_pcm_hw_params_set_format(m_alsa_handle, hw_params,
+                    SND_PCM_FORMAT_S16_LE)) < 0) {
+        fprintf (stderr, "cannot set sample format (%s)\n",
+                snd_strerror(err));
+        return 1;
+    }
+
+    if ((err = snd_pcm_hw_params_set_rate_near(m_alsa_handle,
+                hw_params, &m_rate, 0)) < 0) {
+        fprintf (stderr, "cannot set sample rate (%s)\n",
+                snd_strerror(err));
+        return 1;
+    }
+
+    if ((err = snd_pcm_hw_params_set_channels(m_alsa_handle,
+                    hw_params, m_channels)) < 0) {
+        fprintf (stderr, "cannot set channel count (%s)\n",
+                snd_strerror(err));
+        return 1;
+    }
+
+    if ((err = snd_pcm_hw_params(m_alsa_handle, hw_params)) < 0) {
+        fprintf (stderr, "cannot set parameters (%s)\n",
+                snd_strerror(err));
+        return 1;
+    }
+
+    snd_pcm_hw_params_free (hw_params);
+
+    if ((err = snd_pcm_prepare(m_alsa_handle)) < 0) {
+        fprintf (stderr, "cannot prepare audio interface for use (%s)\n",
+                snd_strerror(err));
+        return 1;
+    }
+
+    fprintf(stderr, "ALSA init done.\n");
+    return 0;
+}
+
+size_t AlsaInput::read(uint8_t* buf, snd_pcm_uframes_t length)
+{
+    int i;
+    int err;
+
+    err = snd_pcm_readi(m_alsa_handle, buf, length);
+
+    if (err != length) {
+        if (err < 0) {
+            fprintf (stderr, "read from audio interface failed (%s)\n",
+                    snd_strerror(err));
+        }
+        else {
+            fprintf(stderr, "short alsa read: %d\n", err);
+        }
+    }
+
+    return err;
+}
+
+int AlsaInput::start()
+{
+    m_running = true;
+    m_thread = boost::thread(&AlsaInput::process, this);
+}
+
+void AlsaInput::process()
+{
+    uint8_t samplebuf[NUM_SAMPLES_PER_CALL * BYTES_PER_SAMPLE * m_channels];
+    while (m_running) {
+        size_t n = read(samplebuf, NUM_SAMPLES_PER_CALL);
+
+        m_queue.push(samplebuf, n);
+    }
+}
+
diff --git a/src/AlsaInput.h b/src/AlsaInput.h
new file mode 100644
index 0000000..b43ad7d
--- /dev/null
+++ b/src/AlsaInput.h
@@ -0,0 +1,90 @@
+/* ------------------------------------------------------------------
+ * Copyright (C) 2011 Martin Storsjo
+ * Copyright (C) 2013,2014 Matthias P. Braendli
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ * -------------------------------------------------------------------
+ */
+
+#ifndef __ALSA_H_
+#define __ALSA_H_
+#include <cstdio>
+#include <stdint.h>
+#include <string>
+
+#include <alsa/asoundlib.h>
+#include <boost/thread/thread.hpp>
+
+#include "SampleQueue.h"
+
+using namespace std;
+
+// 16 bits per sample is fine for now
+#define BYTES_PER_SAMPLE 2
+
+// How many samples we insert into the queue each call
+#define NUM_SAMPLES_PER_CALL 10 // 10 samples @ 32kHz = 3.125ms
+
+class AlsaInput
+{
+    public:
+        AlsaInput(const string& alsa_dev,
+                unsigned int channels,
+                unsigned int rate,
+                SampleQueue<uint8_t>& queue) :
+            m_running(false),
+            m_alsa_dev(alsa_dev),
+            m_channels(channels),
+            m_rate(rate),
+            m_queue(queue),
+            m_alsa_handle(NULL) { }
+
+        ~AlsaInput()
+        {
+            if (m_running) {
+                m_running = false;
+                m_thread.interrupt();
+                m_thread.join();
+            }
+
+            if (m_alsa_handle) {
+                snd_pcm_abort(m_alsa_handle);
+                m_alsa_handle = NULL;
+            }
+        }
+
+        int prepare();
+
+        int start();
+
+    private:
+        AlsaInput(const AlsaInput& other) : m_queue(other.m_queue) {}
+
+        size_t read(uint8_t* buf, snd_pcm_uframes_t length);
+        void process();
+
+        bool m_running;
+        boost::thread m_thread;
+        string m_alsa_dev;
+        unsigned int m_channels;
+        unsigned int m_rate;
+
+        SampleQueue<uint8_t>& m_queue;
+
+        snd_pcm_t *m_alsa_handle;
+
+};
+
+#endif
+
diff --git a/src/SampleQueue.h b/src/SampleQueue.h
new file mode 100644
index 0000000..fddc3a4
--- /dev/null
+++ b/src/SampleQueue.h
@@ -0,0 +1,123 @@
+/*
+   Copyright (C) 2013, 2014
+   Matthias P. Braendli, matthias.braendli@mpb.li
+
+   An implementation for a threadsafe queue using boost thread library
+   for audio samples.
+*/
+
+#ifndef _SAMPLE_QUEUE_H_
+#define _SAMPLE_QUEUE_H_
+
+#include <boost/thread.hpp>
+#include <queue>
+
+/* This queue is meant to be used by two threads. One producer
+ * that pushes elements into the queue, and one consumer that
+ * retrieves the elements.
+ *
+ * The queue can make the consumer block until enough elements
+ * are available.
+ */
+
+template<typename T>
+class SampleQueue
+{
+public:
+    SampleQueue(unsigned int bytes_per_sample,
+            unsigned int channels,
+            size_t max_size) :
+        m_bytes_per_sample(bytes_per_sample),
+        m_channels(channels), m_max_size(max_size) {}
+
+
+    /* Push a bunch of samples into the buffer */
+    size_t push(const T *val, size_t len)
+    {
+        boost::mutex::scoped_lock lock(m_mutex);
+
+        if (m_queue.size() >= m_max_size) {
+            return 0;
+        }
+
+        for (size_t i = 0; i < len; i++) {
+            m_queue.push_back(val[i]);
+        }
+
+        size_t new_size = m_queue.size();
+        lock.unlock();
+
+        //m_condition_variable.notify_one();
+
+        return new_size;
+    }
+
+    bool empty() const
+    {
+        boost::mutex::scoped_lock lock(m_mutex);
+        return m_queue.empty();
+    }
+
+    /* Get len elements, place them into the buf array
+     * Returns the number of elements it was able to take
+     * from the queue
+     */
+    size_t pop(T* buf, size_t len)
+    {
+        boost::mutex::scoped_lock lock(m_mutex);
+
+        size_t ret = 0;
+
+        if (m_queue.size() < len) {
+            size_t i;
+            for (i = 0; i < m_queue.size(); i++) {
+                buf[i] = m_queue[i];
+            }
+
+            ret = i;
+
+            for (; i < len; i++) {
+                buf[i] = 0;
+            }
+
+            m_queue.resize(0);
+        }
+        else {
+            for (size_t i = 0; i < len; i++) {
+                buf[i] = m_queue[i];
+            }
+
+            ret = len;
+
+            m_queue.erase(m_queue.front(), m_queue.front() + len);
+        }
+
+        return ret;
+    }
+
+    /*
+    void wait_and_pop(T& popped_value)
+    {
+        boost::mutex::scoped_lock lock(m_mutex);
+        while(m_queue.size() < m_required_size)
+        {
+            m_condition_variable.wait(lock);
+        }
+
+        popped_value = m_queue.front();
+        m_queue.pop_front();
+    }
+    */
+
+private:
+    std::deque<T> m_queue;
+    mutable boost::mutex m_mutex;
+    //boost::condition_variable m_condition_variable;
+
+    unsigned int m_channels;
+    unsigned int m_bytes_per_sample;
+    size_t m_max_size;
+};
+
+#endif
+
diff --git a/src/zmq.hpp b/src/zmq.hpp
new file mode 100644
index 0000000..147f096
--- /dev/null
+++ b/src/zmq.hpp
@@ -0,0 +1,566 @@
+/*
+    Copyright (c) 2009-2011 250bpm s.r.o.
+    Copyright (c) 2011 Botond Ballo
+    Copyright (c) 2007-2009 iMatix Corporation
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to
+    deal in the Software without restriction, including without limitation the
+    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+    sell copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+    IN THE SOFTWARE.
+*/
+
+#ifndef __ZMQ_HPP_INCLUDED__
+#define __ZMQ_HPP_INCLUDED__
+
+#include <zmq.h>
+
+#include <algorithm>
+#include <cassert>
+#include <cstring>
+#include <string>
+#include <exception>
+
+//  Detect whether the compiler supports C++11 rvalue references.
+#if (defined(__GNUC__) && (__GNUC__ > 4 || \
+      (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) && \
+      defined(__GXX_EXPERIMENTAL_CXX0X__))
+    #define ZMQ_HAS_RVALUE_REFS
+    #define ZMQ_DELETED_FUNCTION = delete
+#elif defined(__clang__)
+    #if __has_feature(cxx_rvalue_references)
+        #define ZMQ_HAS_RVALUE_REFS
+    #endif
+
+    #if __has_feature(cxx_deleted_functions)
+        #define ZMQ_DELETED_FUNCTION = delete
+    #else
+        #define ZMQ_DELETED_FUNCTION
+    #endif
+#elif defined(_MSC_VER) && (_MSC_VER >= 1600)
+    #define ZMQ_HAS_RVALUE_REFS
+    #define ZMQ_DELETED_FUNCTION
+#else
+    #define ZMQ_DELETED_FUNCTION
+#endif
+
+#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3, 3, 0)
+#define ZMQ_NEW_MONITOR_EVENT_LAYOUT
+#endif
+
+// In order to prevent unused variable warnings when building in non-debug
+// mode use this macro to make assertions.
+#ifndef NDEBUG
+#   define ZMQ_ASSERT(expression) assert(expression)
+#else
+#   define ZMQ_ASSERT(expression) (void)(expression)
+#endif
+
+namespace zmq
+{
+
+    typedef zmq_free_fn free_fn;
+    typedef zmq_pollitem_t pollitem_t;
+
+    class error_t : public std::exception
+    {
+    public:
+
+        error_t () : errnum (zmq_errno ()) {}
+
+        virtual const char *what () const throw ()
+        {
+            return zmq_strerror (errnum);
+        }
+
+        int num () const
+        {
+            return errnum;
+        }
+
+    private:
+
+        int errnum;
+    };
+
+    inline int poll (zmq_pollitem_t *items_, int nitems_, long timeout_ = -1)
+    {
+        int rc = zmq_poll (items_, nitems_, timeout_);
+        if (rc < 0)
+            throw error_t ();
+        return rc;
+    }
+
+    inline void proxy (void *frontend, void *backend, void *capture)
+    {
+        int rc = zmq_proxy (frontend, backend, capture);
+        if (rc != 0)
+            throw error_t ();
+    }
+
+    inline void version (int *major_, int *minor_, int *patch_)
+    {
+        zmq_version (major_, minor_, patch_);
+    }
+
+    class message_t
+    {
+        friend class socket_t;
+
+    public:
+
+        inline message_t ()
+        {
+            int rc = zmq_msg_init (&msg);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline explicit message_t (size_t size_)
+        {
+            int rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline message_t (void *data_, size_t size_, free_fn *ffn_,
+            void *hint_ = NULL)
+        {
+            int rc = zmq_msg_init_data (&msg, data_, size_, ffn_, hint_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline message_t (message_t &&rhs) : msg (rhs.msg)
+        {
+            int rc = zmq_msg_init (&rhs.msg);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline message_t &operator = (message_t &&rhs)
+        {
+            std::swap (msg, rhs.msg);
+            return *this;
+        }
+#endif
+
+        inline ~message_t ()
+        {
+            int rc = zmq_msg_close (&msg);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+        inline void rebuild ()
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init (&msg);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void rebuild (size_t size_)
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void rebuild (void *data_, size_t size_, free_fn *ffn_,
+            void *hint_ = NULL)
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init_data (&msg, data_, size_, ffn_, hint_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void move (message_t *msg_)
+        {
+            int rc = zmq_msg_move (&msg, &(msg_->msg));
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void copy (message_t *msg_)
+        {
+            int rc = zmq_msg_copy (&msg, &(msg_->msg));
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline bool more ()
+        {
+            int rc = zmq_msg_more (&msg);
+            return rc != 0;
+        }
+
+        inline void *data ()
+        {
+            return zmq_msg_data (&msg);
+        }
+
+        inline const void* data () const
+        {
+            return zmq_msg_data (const_cast<zmq_msg_t*>(&msg));
+        }
+
+        inline size_t size () const
+        {
+            return zmq_msg_size (const_cast<zmq_msg_t*>(&msg));
+        }
+
+    private:
+
+        //  The underlying message
+        zmq_msg_t msg;
+
+        //  Disable implicit message copying, so that users won't use shared
+        //  messages (less efficient) without being aware of the fact.
+        message_t (const message_t&);
+        void operator = (const message_t&);
+    };
+
+    class context_t
+    {
+        friend class socket_t;
+
+    public:
+        inline context_t ()
+        {
+            ptr = zmq_ctx_new ();
+            if (ptr == NULL)
+                throw error_t ();
+        }
+
+
+        inline explicit context_t (int io_threads_)
+        {
+            ptr = zmq_ctx_new ();
+            if (ptr == NULL)
+                throw error_t ();
+
+            int rc = zmq_ctx_set (ptr, ZMQ_IO_THREADS, io_threads_);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline context_t (context_t &&rhs) : ptr (rhs.ptr)
+        {
+            rhs.ptr = NULL;
+        }
+        inline context_t &operator = (context_t &&rhs)
+        {
+            std::swap (ptr, rhs.ptr);
+            return *this;
+        }
+#endif
+
+        inline ~context_t ()
+        {
+            close();
+        }
+
+        inline void close()
+        {
+            if (ptr == NULL)
+                return;
+            int rc = zmq_ctx_destroy (ptr);
+            ZMQ_ASSERT (rc == 0);
+            ptr = NULL;
+        }
+
+        //  Be careful with this, it's probably only useful for
+        //  using the C api together with an existing C++ api.
+        //  Normally you should never need to use this.
+        inline operator void* ()
+        {
+            return ptr;
+        }
+
+    private:
+
+        void *ptr;
+
+        context_t (const context_t&);
+        void operator = (const context_t&);
+    };
+
+    class socket_t
+    {
+        friend class monitor_t;
+    public:
+
+        inline socket_t (context_t &context_, int type_)
+        {
+            ctxptr = context_.ptr;
+            ptr = zmq_socket (context_.ptr, type_);
+            if (ptr == NULL)
+                throw error_t ();
+        }
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline socket_t(socket_t&& rhs) : ptr(rhs.ptr)
+        {
+            rhs.ptr = NULL;
+        }
+        inline socket_t& operator=(socket_t&& rhs)
+        {
+            std::swap(ptr, rhs.ptr);
+            return *this;
+        }
+#endif
+
+        inline ~socket_t ()
+        {
+            close();
+        }
+
+        inline operator void* ()
+        {
+            return ptr;
+        }
+
+        inline void close()
+        {
+            if(ptr == NULL)
+                // already closed
+                return ;
+            int rc = zmq_close (ptr);
+            ZMQ_ASSERT (rc == 0);
+            ptr = 0 ;
+        }
+
+        inline void setsockopt (int option_, const void *optval_,
+            size_t optvallen_)
+        {
+            int rc = zmq_setsockopt (ptr, option_, optval_, optvallen_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void getsockopt (int option_, void *optval_,
+            size_t *optvallen_)
+        {
+            int rc = zmq_getsockopt (ptr, option_, optval_, optvallen_);
+            if (rc != 0)
+                throw error_t ();
+        }
+        
+        inline void bind (const char *addr_)
+        {
+            int rc = zmq_bind (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void unbind (const char *addr_)
+        {
+            int rc = zmq_unbind (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void connect (const char *addr_)
+        {
+            int rc = zmq_connect (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void disconnect (const char *addr_)
+        {
+            int rc = zmq_disconnect (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline bool connected()
+        {
+            return(ptr != NULL);
+        }
+        
+        inline size_t send (const void *buf_, size_t len_, int flags_ = 0)
+        {
+            int nbytes = zmq_send (ptr, buf_, len_, flags_);
+            if (nbytes >= 0)
+                return (size_t) nbytes;
+            if (zmq_errno () == EAGAIN)
+                return 0;
+            throw error_t ();
+        }
+
+        inline bool send (message_t &msg_, int flags_ = 0)
+        {
+            int nbytes = zmq_msg_send (&(msg_.msg), ptr, flags_);
+            if (nbytes >= 0)
+                return true;
+            if (zmq_errno () == EAGAIN)
+                return false;
+            throw error_t ();
+        }
+
+        inline size_t recv (void *buf_, size_t len_, int flags_ = 0)
+        {
+            int nbytes = zmq_recv (ptr, buf_, len_, flags_);
+            if (nbytes >= 0)
+                return (size_t) nbytes;
+            if (zmq_errno () == EAGAIN)
+                return 0;
+            throw error_t ();
+        }
+
+        inline bool recv (message_t *msg_, int flags_ = 0)
+        {
+            int nbytes = zmq_msg_recv (&(msg_->msg), ptr, flags_);
+            if (nbytes >= 0)
+                return true;
+            if (zmq_errno () == EAGAIN)
+                return false;
+            throw error_t ();
+        }
+        
+    private:
+        void *ptr;
+        void *ctxptr;
+
+        socket_t (const socket_t&) ZMQ_DELETED_FUNCTION;
+        void operator = (const socket_t&) ZMQ_DELETED_FUNCTION;
+    };
+
+    class monitor_t
+    {
+    public:
+        monitor_t() : socketPtr(NULL) {}
+        virtual ~monitor_t() {}
+
+        void monitor(socket_t &socket, const char *addr_, int events = ZMQ_EVENT_ALL)
+        {
+            int rc = zmq_socket_monitor(socket.ptr, addr_, events);
+            if (rc != 0)
+                throw error_t ();
+
+            socketPtr = socket.ptr;
+            void *s = zmq_socket (socket.ctxptr, ZMQ_PAIR);
+            assert (s);
+
+            rc = zmq_connect (s, addr_);
+            assert (rc == 0);
+            
+            on_monitor_started();
+            
+            while (true) {
+                zmq_msg_t eventMsg;
+                zmq_msg_init (&eventMsg);
+                rc = zmq_recvmsg (s, &eventMsg, 0);
+                if (rc == -1 && zmq_errno() == ETERM)
+                    break;
+                assert (rc != -1);
+                zmq_event_t* event = static_cast<zmq_event_t*>(zmq_msg_data (&eventMsg));
+                
+#ifdef ZMQ_NEW_MONITOR_EVENT_LAYOUT
+                zmq_msg_t addrMsg;
+                zmq_msg_init (&addrMsg);
+                rc = zmq_recvmsg (s, &addrMsg, 0);
+                if (rc == -1 && zmq_errno() == ETERM)
+                    break;
+                assert (rc != -1);
+                const char* str = static_cast<const char*>(zmq_msg_data (&addrMsg));
+                std::string address(str, str + zmq_msg_size(&addrMsg));
+                zmq_msg_close (&addrMsg);
+#else
+                // Bit of a hack, but all events in the zmq_event_t union have the same layout so this will work for all event types.
+                std::string address = event->data.connected.addr;
+#endif
+
+#ifdef ZMQ_EVENT_MONITOR_STOPPED
+                if (event->event == ZMQ_EVENT_MONITOR_STOPPED)
+                    break;
+#endif
+
+                switch (event->event) {
+                case ZMQ_EVENT_CONNECTED:
+                    on_event_connected(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CONNECT_DELAYED:
+                    on_event_connect_delayed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CONNECT_RETRIED:
+                    on_event_connect_retried(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_LISTENING:
+                    on_event_listening(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_BIND_FAILED:
+                    on_event_bind_failed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_ACCEPTED:
+                    on_event_accepted(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_ACCEPT_FAILED:
+                    on_event_accept_failed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CLOSED:
+                    on_event_closed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CLOSE_FAILED:
+                    on_event_close_failed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_DISCONNECTED:
+                    on_event_disconnected(*event, address.c_str());
+                    break;
+                default:
+                    on_event_unknown(*event, address.c_str());
+                    break;
+                }
+                zmq_msg_close (&eventMsg);
+            }
+            zmq_close (s);
+            socketPtr = NULL;
+        }
+
+#ifdef ZMQ_EVENT_MONITOR_STOPPED
+        void abort()
+        {
+            if (socketPtr)
+                zmq_socket_monitor(socketPtr, NULL, 0);
+        }
+#endif
+        virtual void on_monitor_started() {}
+        virtual void on_event_connected(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_connect_delayed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_connect_retried(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_listening(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_bind_failed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_accepted(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_accept_failed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_closed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_close_failed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_disconnected(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_unknown(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+    private:
+        void* socketPtr;
+    };
+}
+
+#endif