aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-04-15 11:24:35 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-04-15 11:26:37 +0200
commit0771e521bea04a25536120d00f987b5c491b2e6a (patch)
tree1ac3a409f93caaff96f17642e6616f1f4eafa508
parent07d3536083ad8d0f08819e8be89aa5934fcaa712 (diff)
downloaddabmux-0771e521bea04a25536120d00f987b5c491b2e6a.tar.gz
dabmux-0771e521bea04a25536120d00f987b5c491b2e6a.tar.bz2
dabmux-0771e521bea04a25536120d00f987b5c491b2e6a.zip
Simplify getSubchannel by using lambda
-rw-r--r--src/MuxElements.cpp2
-rw-r--r--src/MuxElements.h9
2 files changed, 1 insertions, 10 deletions
diff --git a/src/MuxElements.cpp b/src/MuxElements.cpp
index c02afcd..fd8d57a 100644
--- a/src/MuxElements.cpp
+++ b/src/MuxElements.cpp
@@ -207,7 +207,7 @@ vector<DabSubchannel*>::iterator getSubchannel(
return find_if(
subchannels.begin(),
subchannels.end(),
- bind2nd(SubchannelId(), id)
+ [&](const DabSubchannel* s){ return s->id == id; }
);
}
diff --git a/src/MuxElements.h b/src/MuxElements.h
index 7f48827..289c35a 100644
--- a/src/MuxElements.h
+++ b/src/MuxElements.h
@@ -280,15 +280,6 @@ public:
};
-class SubchannelId : public std::binary_function <DabSubchannel*, int, bool> {
-public:
- bool operator()(const DabSubchannel* subchannel, const int id) const {
- return subchannel->id == id;
- }
-};
-
-
-
struct dabAudioComponent {
dabAudioComponent() :