[med-svn] [SCM] aghermann branch, master, updated. c0bd21ca8eb529ade7e0c7aad22951a308a8dc8f

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 270ca431565d868b924a3d9b4a36d27c046a21a8
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Tue Apr 23 16:39:14 2013 +0300

    don't decorate channels of unrecognised type

diff --git a/src/libsigfile/edf.cc b/src/libsigfile/edf.cc
index 21c678b..eb8002e 100644
--- a/src/libsigfile/edf.cc
+++ b/src/libsigfile/edf.cc
@@ -798,15 +798,11 @@ _parse_header()
 				H.signal_type_s = SChannel::kemp_signal_types[
 					H.signal_type = SChannel::signal_type_of_channel( H.label) ];
 
-				if ( not H.label.follows_system1020() ) {  // in case there are duplicate labels, rewrite
-					DEF_UNIQUE_CHARP (_);
-					ASPRINTF( &_, "%zu:<%s>", i, H.label.c_str());
-					H.label.assign( _);
+				if ( not H.label.follows_system1020() )
 					_status |= non1020_channel;
-				}
+				if ( H.signal_type == SChannel::TType::other )
+					_status |= nonkemp_signaltype;
 			}
-			if ( H.signal_type == SChannel::TType::other )
-				_status |= nonkemp_signaltype;
 		}
 		++i;
 	}

-- 
Sleep experiment manager