From 4c541a77980cce7f3070e67a938538cabd920eca Mon Sep 17 00:00:00 2001
From: tho <tho@wiback.org>
Date: Fri, 20 Jul 2007 10:03:44 +0000
Subject: [PATCH] Stefan doesn't like MPEG_DVBBundle; renamed to MPEGDVBBundle
;)
---
Examples/DVBdec/MPEdec.cc | 2 +-
Examples/DVBdec/SConscript | 4 ++--
Examples/DVBdec/ULEdec.cc | 2 +-
Packets/{MPEG_DVBBundle => MPEGDVBBundle}/DSMCCSection.cc | 4 ++--
Packets/{MPEG_DVBBundle => MPEGDVBBundle}/DSMCCSection.hh | 0
Packets/{MPEG_DVBBundle => MPEGDVBBundle}/DatagramSection.cc | 4 ++--
Packets/{MPEG_DVBBundle => MPEGDVBBundle}/DatagramSection.hh | 2 +-
Packets/{MPEG_DVBBundle => MPEGDVBBundle}/Doxyfile | 4 ++--
Packets/{MPEG_DVBBundle => MPEGDVBBundle}/SConscript | 4 ++--
9 files changed, 13 insertions(+), 13 deletions(-)
rename Packets/{MPEG_DVBBundle => MPEGDVBBundle}/DSMCCSection.cc (97%)
rename Packets/{MPEG_DVBBundle => MPEGDVBBundle}/DSMCCSection.hh (100%)
rename Packets/{MPEG_DVBBundle => MPEGDVBBundle}/DatagramSection.cc (97%)
rename Packets/{MPEG_DVBBundle => MPEGDVBBundle}/DatagramSection.hh (98%)
rename Packets/{MPEG_DVBBundle => MPEGDVBBundle}/Doxyfile (65%)
rename Packets/{MPEG_DVBBundle => MPEGDVBBundle}/SConscript (70%)
diff --git a/Examples/DVBdec/MPEdec.cc b/Examples/DVBdec/MPEdec.cc
index 278cb750c..372e7bebf 100644
--- a/Examples/DVBdec/MPEdec.cc
+++ b/Examples/DVBdec/MPEdec.cc
@@ -31,7 +31,7 @@
#include "Scheduler/Scheduler.hh"
#include "Packets/DefaultBundle/EthernetPacket.hh"
-#include "Packets/MPEG_DVBBundle/DatagramSection.hh"
+#include "Packets/MPEGDVBBundle/DatagramSection.hh"
#include "Utils/membind.hh"
#include "Socket/DVBDemuxHandles.hh"
#include "Packets/ParseInt.hh"
diff --git a/Examples/DVBdec/SConscript b/Examples/DVBdec/SConscript
index 5f69e8442..f18f7dd02 100644
--- a/Examples/DVBdec/SConscript
+++ b/Examples/DVBdec/SConscript
@@ -5,8 +5,8 @@ import SENFSCons
SENFSCons.Binary(env, 'uledec', 'ULEdec.cc',
LIBS = [ 'Scheduler', 'Packets', 'Socket', 'Utils' ],
- OBJECTS = [ '#/Packets/MPEG_DVBBundle/MPEG_DVBBundle.o' ]);
+ OBJECTS = [ '#/Packets/MPEGDVBBundle/MPEGDVBBundle.o' ]);
SENFSCons.Binary(env, 'mpedec', 'MPEdec.cc',
LIBS = [ 'Scheduler', 'Packets', 'Socket', 'Utils' ],
- OBJECTS = [ '#/Packets/MPEG_DVBBundle/MPEG_DVBBundle.o' ]);
+ OBJECTS = [ '#/Packets/MPEGDVBBundle/MPEGDVBBundle.o' ]);
diff --git a/Examples/DVBdec/ULEdec.cc b/Examples/DVBdec/ULEdec.cc
index 6c23a5680..b41c3a859 100644
--- a/Examples/DVBdec/ULEdec.cc
+++ b/Examples/DVBdec/ULEdec.cc
@@ -31,7 +31,7 @@
#include "Scheduler/Scheduler.hh"
#include "Packets/DefaultBundle/EthernetPacket.hh"
-#include "Packets/MPEG_DVBBundle/DatagramSection.hh"
+#include "Packets/MPEGDVBBundle/DatagramSection.hh"
#include "Utils/membind.hh"
#include "Socket/DVBDemuxHandles.hh"
#include "Packets/ParseInt.hh"
diff --git a/Packets/MPEG_DVBBundle/DSMCCSection.cc b/Packets/MPEGDVBBundle/DSMCCSection.cc
similarity index 97%
rename from Packets/MPEG_DVBBundle/DSMCCSection.cc
rename to Packets/MPEGDVBBundle/DSMCCSection.cc
index e3e333edc..f34ed9182 100644
--- a/Packets/MPEG_DVBBundle/DSMCCSection.cc
+++ b/Packets/MPEGDVBBundle/DSMCCSection.cc
@@ -60,12 +60,12 @@ prefix_ void senf::DSMCCSectionType::dump(packet p, std::ostream & os)
prefix_ senf::PacketParserBase::size_type senf::DSMCCSectionType::initSize()
{
- return initHeadSize() + 32/8;
+ return parser::fixed_bytes + 32/8;
}
prefix_ senf::PacketParserBase::size_type senf::DSMCCSectionType::initHeadSize()
{
- return (8+1+1+2+12+16+2+5+1+8+8) / 8;
+ return parser::fixed_bytes;
}
///////////////////////////////cc.e////////////////////////////////////////
diff --git a/Packets/MPEG_DVBBundle/DSMCCSection.hh b/Packets/MPEGDVBBundle/DSMCCSection.hh
similarity index 100%
rename from Packets/MPEG_DVBBundle/DSMCCSection.hh
rename to Packets/MPEGDVBBundle/DSMCCSection.hh
diff --git a/Packets/MPEG_DVBBundle/DatagramSection.cc b/Packets/MPEGDVBBundle/DatagramSection.cc
similarity index 97%
rename from Packets/MPEG_DVBBundle/DatagramSection.cc
rename to Packets/MPEGDVBBundle/DatagramSection.cc
index d46ab2b1a..d25f515bf 100644
--- a/Packets/MPEG_DVBBundle/DatagramSection.cc
+++ b/Packets/MPEGDVBBundle/DatagramSection.cc
@@ -67,12 +67,12 @@ prefix_ void senf::DatagramSectionType::dump(packet p, std::ostream & os)
prefix_ senf::PacketParserBase::size_type senf::DatagramSectionType::initSize()
{
- return initHeadSize() + 32/8;
+ return parser::fixed_bytes + 32/8;
}
prefix_ senf::PacketParserBase::size_type senf::DatagramSectionType::initHeadSize()
{
- return (8+1+1+2+12+8+8+2+2+2+1+1+8+8+8+8+8+8) / 8;
+ return parser::fixed_bytes;
}
///////////////////////////////cc.e////////////////////////////////////////
diff --git a/Packets/MPEG_DVBBundle/DatagramSection.hh b/Packets/MPEGDVBBundle/DatagramSection.hh
similarity index 98%
rename from Packets/MPEG_DVBBundle/DatagramSection.hh
rename to Packets/MPEGDVBBundle/DatagramSection.hh
index d9d5b4fb1..70227093b 100644
--- a/Packets/MPEG_DVBBundle/DatagramSection.hh
+++ b/Packets/MPEGDVBBundle/DatagramSection.hh
@@ -29,7 +29,7 @@
#include "Packets/ParseInt.hh"
#include "Packets/PacketRegistry.hh"
#include "Packets/PacketParser.hh"
-#include "Packets/MPEG_DVBBundle/DSMCCSection.hh"
+#include "Packets/MPEGDVBBundle/DSMCCSection.hh"
//#include "DatagramSection.mpp"
diff --git a/Packets/MPEG_DVBBundle/Doxyfile b/Packets/MPEGDVBBundle/Doxyfile
similarity index 65%
rename from Packets/MPEG_DVBBundle/Doxyfile
rename to Packets/MPEGDVBBundle/Doxyfile
index 17270267a..9e3a96033 100644
--- a/Packets/MPEG_DVBBundle/Doxyfile
+++ b/Packets/MPEGDVBBundle/Doxyfile
@@ -1,6 +1,6 @@
@INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global"
-PROJECT_NAME = libPackets/MPEG_DVBBundle
+PROJECT_NAME = libPackets/MPEGDVBBundle
TAGFILES = "$(TOPDIR)/Utils/doc/Utils.tag" "$(TOPDIR)/Packets/doc/Packets.tag"
-GENERATE_TAGFILE = doc/MPEG_DVBBundle.tag
+GENERATE_TAGFILE = doc/MPEGDVBBundle.tag
INPUT = .
diff --git a/Packets/MPEG_DVBBundle/SConscript b/Packets/MPEGDVBBundle/SConscript
similarity index 70%
rename from Packets/MPEG_DVBBundle/SConscript
rename to Packets/MPEGDVBBundle/SConscript
index 57d258dbc..5d94e25ef 100644
--- a/Packets/MPEG_DVBBundle/SConscript
+++ b/Packets/MPEGDVBBundle/SConscript
@@ -9,9 +9,9 @@ sources = SENFSCons.GlobSources()
SENFSCons.StandardTargets(env)
-SENFSCons.Object(env, target = 'MPEG_DVBBundle', sources=sources,
+SENFSCons.Object(env, target = 'MPEGDVBBundle', sources=sources,
LIBS = ['Packets', 'Socket', 'Utils'])
-SENFSCons.Lib(env, library = 'Packets_MPEG_DVBBundle', sources = sources[0],
+SENFSCons.Lib(env, library = 'Packets_MPEGDVBBundle', sources = sources[0],
LIBS = ['Packets', 'Socket', 'Utils'])
SENFSCons.Doxygen(env)
--
GitLab