The following commit has been merged in the master branch:
commit 6fc0805e8e86b2cef1df5bdca409ee0a14fed144
Author: Andrei Zavada <[email protected]>
Date: Thu Apr 25 15:28:28 2013 +0300
clarify CTypedSource::TType values (subsume edfplus into edf)
diff --git a/src/libsigfile/source.cc b/src/libsigfile/source.cc
index 6aa74f0..b63ded3 100644
--- a/src/libsigfile/source.cc
+++ b/src/libsigfile/source.cc
@@ -28,9 +28,6 @@ CTypedSource (const string& fname,
case TType::edf:
_obj = new CEDFFile( fname, flags);
break;
- case TType::edfplus:
- //_obj = new CEDFPlusFile( fname);
- break;
case TType::unrecognised:
throw invalid_argument ("Unrecognised source type");
}
@@ -63,10 +60,6 @@ CTypedSource (CTypedSource&& rv)
case TType::edf:
_obj = new CEDFFile( move(*(CEDFFile*)rv._obj));
break;
- case TType::edfplus:
- //_obj = new CEDFPlusFile( *static_cast<CEDFPlusFile*>(rv._obj);
- throw invalid_argument ("Source type 'edf+' not yet supported");
- break;
case TType::unrecognised:
throw invalid_argument ("Unrecognised source type");
default:
diff --git a/src/libsigfile/source.hh b/src/libsigfile/source.hh
index 449269a..98aed9d 100644
--- a/src/libsigfile/source.hh
+++ b/src/libsigfile/source.hh
@@ -37,7 +37,7 @@ class CTypedSource
enum class TType : int {
unrecognised,
bin, ascii,
- edf, edfplus,
+ edf,
};
private:
diff --git a/src/ui/mw/admit-one.cc b/src/ui/mw/admit-one.cc
index 4b392f2..bb7ef16 100644
--- a/src/ui/mw/admit-one.cc
+++ b/src/ui/mw/admit-one.cc
@@ -30,7 +30,6 @@ dnd_maybe_admit_one( const char* fname)
Fp = new CTypedSource (fname, ED->fft_params.pagesize);
switch ( Fp->type() ) {
case CTypedSource::TType::edf:
- case CTypedSource::TType::edfplus:
{
CEDFFile& F = *static_cast<CEDFFile*> (&(*Fp)());
if ( F.subtype() == CEDFFile::TSubtype::edfplus_d ) {
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
