X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FDVB%2FDVBSocketController.cc;h=f9078da4dc58529f8b139512caf2fad021b01b82;hb=8a6697d11e9a6557d9a5c42b4052666fce32bc10;hp=0f4ddcb68fad27e0f4f3c35176d7bc6c00100836;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git diff --git a/senf/Socket/Protocols/DVB/DVBSocketController.cc b/senf/Socket/Protocols/DVB/DVBSocketController.cc index 0f4ddcb..f9078da 100644 --- a/senf/Socket/Protocols/DVB/DVBSocketController.cc +++ b/senf/Socket/Protocols/DVB/DVBSocketController.cc @@ -2,26 +2,30 @@ // // Copyright (C) 2007 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Anton Gillert // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Anton Gillert /** \file - \brief DVBSocketControlle-r non-inline non-template implementation */ + \brief DVBSocketController non-inline non-template implementation */ #include "DVBSocketController.hh" @@ -30,12 +34,12 @@ #include #include #include +#include #include +#include "DVBProtocolWrapper.hh" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// - -using namespace std; +//-///////////////////////////////////////////////////////////////////////////////////////////////// unsigned int senf::DVBSocketController::controllerNr(0); @@ -96,12 +100,12 @@ prefix_ void senf::DVBSocketController::addToConsole(senf::DVBDemuxPESHandle sh) pesNr++; } -prefix_ void senf::DVBSocketController::tuneToCMD(const string & input, const string & mode) +prefix_ void senf::DVBSocketController::tuneToCMD(std::string const & input, std::string const & mode) { struct dvb_frontend_parameters frontend; // no valid configline, so it will be treaten like a channel name - if (input.find(":")==string::npos) + if (input.find(":") == std::string::npos) { if (mode.c_str()[0]=='a') tuneTo(input); @@ -155,11 +159,11 @@ prefix_ void senf::DVBSocketController::tuneToCMD(const string & input, const st } } -prefix_ void senf::DVBSocketController::tuneTo(const string & channel) +prefix_ void senf::DVBSocketController::tuneTo(std::string const & channel) { struct dvb_frontend_parameters frontend; - string configLine = parser.getConfigLine(channel); + std::string configLine = parser.getConfigLine(channel); frontend = parser.getFrontendParam(configLine); switch (type) { @@ -244,11 +248,11 @@ prefix_ void senf::DVBSocketController::tuneDVB_C(unsigned int frequency, frontendHandle.protocol().tuneDVB_C(frequency, inversion, symbol_rate, fec_inner, modulation); } -prefix_ dvb_frontend_event senf::DVBSocketController::tuneTo_sync(const string & channel) +prefix_ dvb_frontend_event senf::DVBSocketController::tuneTo_sync(std::string const & channel) { struct dvb_frontend_parameters frontend; dvb_frontend_event ev; - string configLine = parser.getConfigLine(channel); + std::string configLine = parser.getConfigLine(channel); frontend = parser.getFrontendParam(configLine); switch (type) { @@ -351,7 +355,7 @@ prefix_ dvb_frontend_event senf::DVBSocketController::tuneDVB_C_sync(unsigned in } -prefix_ string senf::DVBSocketController::getTypeString() +prefix_ std::string senf::DVBSocketController::getTypeString() { switch (type) { case FE_QPSK: @@ -380,10 +384,10 @@ prefix_ unsigned int senf::DVBSocketController::signalStrength() return frontendHandle.protocol().signalStrength(); } -prefix_ string senf::DVBSocketController::getTuneInfo(const string & conf) +prefix_ std::string senf::DVBSocketController::getTuneInfo(std::string const & conf) { const char* cConf = conf.c_str(); - stringstream info; + std::stringstream info; fe_status_t status; frontendHandle.protocol().setNonBlock(false); @@ -395,7 +399,7 @@ prefix_ string senf::DVBSocketController::getTuneInfo(const string & conf) ber = frontendHandle.protocol().bitErrorRate(); uncorrected_blocks = frontendHandle.protocol().uncorrectedBlocks(); - info << hex; + info << std::hex; for (unsigned int i = 0; i < conf.size(); ++i) { if (i>0) @@ -423,9 +427,9 @@ prefix_ string senf::DVBSocketController::getTuneInfo(const string & conf) return info.str(); } -prefix_ string senf::DVBSocketController::status2String(fe_status_t status) +prefix_ std::string senf::DVBSocketController::status2String(fe_status_t status) { - string s(""); + std::string s(""); if (status & FE_HAS_LOCK) return s += "HAS LOCK"; if (status & FE_HAS_CARRIER) @@ -444,8 +448,6 @@ prefix_ string senf::DVBSocketController::status2String(fe_status_t status) return s; } - - prefix_ fe_type_t senf::DVBSocketController::getType() { return type; @@ -459,8 +461,8 @@ prefix_ void senf::DVBSocketController::readEvent(int event) prefix_ void senf::DVBSocketController::initConsole() { - namespace fty = senf::console::factory; - namespace kw = senf::console::kw; + namespace fty = console::factory; + namespace kw = console::kw; dir.doc("DVB Controller " + controllerNr); ++controllerNr; @@ -486,7 +488,7 @@ prefix_ void senf::DVBSocketController::initConsole() .arg("mode", "mode 'sync' or 'async'", kw::default_value = "async") ); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_