Added additional operators to RestrictedInt and made

[senf.git] / senf / Utils / Beeper.cc

diff --git a/senf/Utils/Beeper.cc b/senf/Utils/Beeper.cc
index bb4517e..6fc5895 100644 (file)
--- a/senf/Utils/Beeper.cc
+++ b/senf/Utils/Beeper.cc
@@ -2,46 +2,49 @@
 //
 // Copyright (C) 2010
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Thorsten Horstmann <tho@berlios.de>
 //
-// 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):
+//   Thorsten Horstmann <tho@berlios.de>
 
 /** \file
-    \brief TypeInfo non-inline non-template implementation */
+    \brief Beeper non-inline non-template implementation */
 
 #include "Beeper.hh"
 //#include "Beeper.ih"
 
 // Custom includes
 #include <unistd.h>
-#include <sys/ioctl.h>
 #include <fcntl.h>
-#include <linux/kd.h>
 #include <boost/bind.hpp>
 #include "Exception.hh"
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::Beeper
 
 prefix_ senf::Beeper::Beeper(std::string const & device)
-    : timer_( "senf::Beeper::timer", boost::bind(&Beeper::timeout, this), 0, false)
+    : timer_( "senf::Beeper::timer", boost::bind(&Beeper::timeout, this), SENF_INT2CLOCKTYPE(0), false)
 {
     if ((fd_ = ::open(device.c_str(), O_WRONLY)) == -1) {
         SENF_THROW_SYSTEM_EXCEPTION("Could not open device for Beeper.");
@@ -54,16 +57,6 @@ prefix_ senf::Beeper::~Beeper()
     ::close(fd_);
 }
 
-prefix_ bool senf::Beeper::start_beep(float freq)
-{
-    return ::ioctl(fd_, KIOCSOUND, (int)(CLOCK_TICK_RATE/freq)) == 0;
-}
-
-prefix_ void senf::Beeper::stop_beep()
-{
-    ::ioctl(fd_, KIOCSOUND, 0);
-}
-
 prefix_ void senf::Beeper::beep_sync(float freq, unsigned length, unsigned count, unsigned delay)
 {
     for (unsigned i = 0; i < count; ++i) {
@@ -103,7 +96,7 @@ prefix_ void senf::Beeper::timeout()
     }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f