[Traverso-commit] traverso/src/core ReadSource.cpp ReadSource.h R...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/01/11 15:35:57

Modified files:
        src/core       : ReadSource.cpp ReadSource.h 
                         ResourcesManager.cpp 

Log message:
        * append 'Reason: yada' to error message when ReadSource::init() failed

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.cpp?cvsroot=traverso&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.h?cvsroot=traverso&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ResourcesManager.cpp?cvsroot=traverso&r1=1.22&r2=1.23

Patches:
Index: ReadSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- ReadSource.cpp      28 Dec 2007 00:28:30 -0000      1.89
+++ ReadSource.cpp      11 Jan 2008 15:35:57 -0000      1.90
@@ -688,3 +688,15 @@
        prepare_rt_buffers();
 }
 
+QString ReadSource::get_error_string() const
+{
+       switch(m_error) {
+               case COULD_NOT_OPEN_FILE: return tr("Could not open file");
+               case INVALID_CHANNEL_COUNT: return tr("Invalid channel count");
+               case ZERO_CHANNELS: return tr("File has zero channels");
+               case FILE_DOES_NOT_EXIST: return tr("The file does not exist!");
+               default: return tr("No ReadSource error set");
+       }
+       return tr("No ReadSource error set");
+}
+

Index: ReadSource.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- ReadSource.h        17 Dec 2007 21:17:08 -0000      1.45
+++ ReadSource.h        11 Jan 2008 15:35:57 -0000      1.46
@@ -63,6 +63,7 @@
 
        int init();
        int get_error() const {return m_error;}
+       QString get_error_string() const;
        int set_file(const QString& filename);
        void set_active(bool active);
        

Index: ResourcesManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ResourcesManager.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- ResourcesManager.cpp        17 Aug 2007 00:18:30 -0000      1.22
+++ ResourcesManager.cpp        11 Jan 2008 15:35:57 -0000      1.23
@@ -231,8 +231,8 @@
        }
        
        if ( source->init() < 0) {
-               info().warning( tr("ResourcesManager::  Failed to initialize 
ReadSource %1")
-                               .arg(source->get_filename()));
+               info().warning( tr("ResourcesManager::  Failed to initialize 
ReadSource %1 (Reason: %2)")
+                               
.arg(source->get_filename()).arg(source->get_error_string()));
        }
        
        return source;