Fixes #174: Merge branch '174-networksourceunavailable-not-exposed-to…

…-python'
gift-surg · Mar 14, 2017 · 31d4800 · 31d4800
2 parents e796b7e + 76cd053
commit 31d4800
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -365,6 +365,7 @@ pypi-network-sources:
     - gift-epiphan-pearl
   only:
     - 5-add-support-for-blackmagic
+    - 174-networksourceunavailable-not-exposed-to-python
 
 ################## Device: Epiphan Pearl ##################
 network-sources:
@@ -391,6 +392,7 @@ network-sources:
     - gift-epiphan-pearl
   only:
     - 5-add-support-for-blackmagic
+    - 174-networksourceunavailable-not-exposed-to-python
 
 ################## Device: Blackmagic DeckLink SDI 4K ##################
 pypi-blackmagic-decklink-sdi-4k:

diff --git a/doc/py-api.md b/doc/py-api.md
@@ -24,3 +24,4 @@ In particular the following classes are available and are of interest to Python
      * `DeviceAlreadyConnected`
      * `DeviceNotFound`
      * `DeviceOffline`
+     * `NetworkSourceUnavailable`
diff --git a/src/api/except.h b/src/api/except.h
@@ -184,6 +184,9 @@ class ObserverError : public BasicException
 //! \brief Thrown in case of problems related
 //! to network video sources.
 //!
+//! \attention <b>In Python:</b> This exception
+//! maps to \c IOError
+//!
 class NetworkSourceUnavailable : public BasicException
 {
 public:

diff --git a/src/python/wrapper.cpp b/src/python/wrapper.cpp
@@ -377,6 +377,13 @@ void translate_DeviceOffline(gg::DeviceOffline const & e)
     PyErr_SetString(PyExc_IOError, msg.c_str());
 }
 
+void translate_NetworkSourceUnavailable(gg::NetworkSourceUnavailable const & e)
+{
+    std::string msg;
+    msg.append("NetworkSourceUnavailable: ").append(e.what());
+    PyErr_SetString(PyExc_IOError, msg.c_str());
+}
+
 void translate_VideoTargetError(gg::VideoTargetError const & e)
 {
     std::string msg;
@@ -403,6 +410,7 @@ BOOST_PYTHON_MODULE(pygiftgrab)
     register_exception_translator<gg::DeviceAlreadyConnected>(&translate_DeviceAlreadyConnected);
     register_exception_translator<gg::DeviceNotFound>(&translate_DeviceNotFound);
     register_exception_translator<gg::DeviceOffline>(&translate_DeviceOffline);
+    register_exception_translator<gg::NetworkSourceUnavailable>(&translate_NetworkSourceUnavailable);
     register_exception_translator<gg::VideoTargetError>(&translate_VideoTargetError);
     register_exception_translator<gg::ObserverError>(&translate_ObserverError);