[vlc-commits] medialib: Update DeviceRemoved exception type

Hugo Beauzée-Luyssen git at videolan.org
Tue Oct 29 11:56:12 CET 2019


vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Oct 10 16:28:03 2019 +0200| [a13ba59f727ed5a8f73125a8c0502f8484bfd7bf] | committer: Hugo Beauzée-Luyssen

medialib: Update DeviceRemoved exception type

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a13ba59f727ed5a8f73125a8c0502f8484bfd7bf
---

 modules/misc/medialibrary/entities.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/misc/medialibrary/entities.cpp b/modules/misc/medialibrary/entities.cpp
index 35975c8ab7..ea4b402257 100644
--- a/modules/misc/medialibrary/entities.cpp
+++ b/modules/misc/medialibrary/entities.cpp
@@ -39,6 +39,7 @@
 #include <medialibrary/IVideoTrack.h>
 #include <medialibrary/IFolder.h>
 #include <medialibrary/filesystem/IDevice.h>
+#include <medialibrary/filesystem/Errors.h>
 
 #include <algorithm>
 
@@ -288,7 +289,7 @@ bool Convert( const medialibrary::IFile* input, vlc_ml_file_t& output )
         if( !strdup_helper( input->mrl(), output.psz_mrl ) )
             return false;
     }
-    catch ( const medialibrary::fs::DeviceRemovedException& )
+    catch ( const medialibrary::fs::errors::DeviceRemoved& )
     {
         output.psz_mrl = nullptr;
         output.b_present = false;
@@ -410,7 +411,7 @@ bool Convert( const medialibrary::IFolder* input, vlc_ml_entry_point_t& output )
             return false;
         output.b_present = true;
     }
-    catch ( const medialibrary::fs::DeviceRemovedException& )
+    catch ( const medialibrary::fs::errors::DeviceRemoved& )
     {
         output.psz_mrl = nullptr;
         output.b_present = false;
@@ -434,7 +435,7 @@ input_item_t* MediaToInputItem( const medialibrary::IMedia* media )
     {
         mrl = (*it)->mrl();
     }
-    catch ( const medialibrary::fs::DeviceRemovedException& ex )
+    catch ( const medialibrary::fs::errors::DeviceRemoved& ex )
     {
         return nullptr;
     }



More information about the vlc-commits mailing list