summaryrefslogtreecommitdiffstats
path: root/src/MuxElements.h
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-04-15 11:10:00 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-04-15 11:10:00 +0200
commit07d3536083ad8d0f08819e8be89aa5934fcaa712 (patch)
treec56bd0a1f14a0b8722f9950cf539a12b641706c1 /src/MuxElements.h
parent8ee90d42fc999d4048d789fa719aff20df3dfba4 (diff)
downloaddabmux-07d3536083ad8d0f08819e8be89aa5934fcaa712.tar.gz
dabmux-07d3536083ad8d0f08819e8be89aa5934fcaa712.tar.bz2
dabmux-07d3536083ad8d0f08819e8be89aa5934fcaa712.zip
Rename dabSubchannel to DabSubchannel
Diffstat (limited to 'src/MuxElements.h')
-rw-r--r--src/MuxElements.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/MuxElements.h b/src/MuxElements.h
index ef5957f..7f48827 100644
--- a/src/MuxElements.h
+++ b/src/MuxElements.h
@@ -168,7 +168,7 @@ class DabLabel
class DabService;
class DabComponent;
-class dabSubchannel;
+class DabSubchannel;
class dabEnsemble : public RemoteControllable {
public:
dabEnsemble()
@@ -201,7 +201,7 @@ class dabEnsemble : public RemoteControllable {
std::vector<std::shared_ptr<DabService> > services;
std::vector<DabComponent*> components;
- std::vector<dabSubchannel*> subchannels;
+ std::vector<DabSubchannel*> subchannels;
std::vector<std::shared_ptr<AnnouncementCluster> > clusters;
};
@@ -242,10 +242,10 @@ struct dabProtection {
};
};
-class dabSubchannel
+class DabSubchannel
{
public:
- dabSubchannel(std::string& uid) :
+ DabSubchannel(std::string& uid) :
uid(uid),
input(),
id(0),
@@ -280,9 +280,9 @@ public:
};
-class SubchannelId : public std::binary_function <dabSubchannel*, int, bool> {
+class SubchannelId : public std::binary_function <DabSubchannel*, int, bool> {
public:
- bool operator()(const dabSubchannel* subchannel, const int id) const {
+ bool operator()(const DabSubchannel* subchannel, const int id) const {
return subchannel->id == id;
}
};
@@ -343,7 +343,7 @@ class DabComponent : public RemoteControllable
dabFidcComponent fidc;
dabPacketComponent packet;
- bool isPacketComponent(std::vector<dabSubchannel*>& subchannels) const;
+ bool isPacketComponent(std::vector<DabSubchannel*>& subchannels) const;
/* Remote control */
virtual void set_parameter(const std::string& parameter,
@@ -406,8 +406,8 @@ class DabService : public RemoteControllable
DabService(const DabService& other);
};
-std::vector<dabSubchannel*>::iterator getSubchannel(
- std::vector<dabSubchannel*>& subchannels, int id);
+std::vector<DabSubchannel*>::iterator getSubchannel(
+ std::vector<DabSubchannel*>& subchannels, int id);
std::vector<DabComponent*>::iterator getComponent(
std::vector<DabComponent*>& components,