Removed boost::mutex stuff, fixed some #includes

This commit is contained in:
Ingo Ruhnke 2011-04-09 16:02:24 +02:00
parent 5522df6dcf
commit 29e5dcc240
7 changed files with 7 additions and 9 deletions

View file

@ -19,6 +19,7 @@
#include "axis_event.hpp"
#include <boost/tokenizer.hpp>
#include <math.h>
#include "evdev_helper.hpp"
#include "log.hpp"

View file

@ -19,6 +19,7 @@
#include "button_event.hpp"
#include <boost/tokenizer.hpp>
#include <errno.h>
#include <fstream>
#include "evdev_helper.hpp"

View file

@ -18,10 +18,11 @@
#include "uinput.hpp"
#include <boost/tokenizer.hpp>
#include <iostream>
#include <math.h>
#include <stdexcept>
#include <stdio.h>
#include <boost/tokenizer.hpp>
#include "helper.hpp"
#include "log.hpp"
@ -103,7 +104,6 @@ UInput::UInput(bool extra_events) :
m_device_names(),
m_device_usbids(),
m_rel_repeat_lst(),
m_mutex(),
m_extra_events(extra_events),
m_timeout_id(),
m_timer(g_timer_new())

View file

@ -19,8 +19,8 @@
#ifndef HEADER_UINPUT_HPP
#define HEADER_UINPUT_HPP
#include <boost/thread/mutex.hpp>
#include <glib.h>
#include <map>
#include "axis_event.hpp"
#include "linux_uinput.hpp"
@ -71,7 +71,6 @@ private:
std::map<UIEvent, RelRepeat> m_rel_repeat_lst;
boost::mutex m_mutex;
bool m_extra_events;
guint m_timeout_id;
@ -116,8 +115,6 @@ public:
void sync();
/** @} */
boost::mutex& get_mutex() { return m_mutex; }
private:
void update(int msec_delta);

View file

@ -43,8 +43,6 @@ UInputMessageProcessor::send(const XboxGenericMsg& msg_in, int msec_delta)
{
if (!m_config->empty())
{
boost::mutex::scoped_lock lock(m_uinput.get_mutex());
XboxGenericMsg msg = msg_in;
// handling switching of configurations
@ -73,7 +71,6 @@ UInputMessageProcessor::send(const XboxGenericMsg& msg_in, int msec_delta)
(*i)->update(msec_delta, msg);
}
m_uinput.update(msec_delta);
m_config->get_config()->get_uinput().update(msec_delta);
// send current Xbox state to uinput

View file

@ -21,6 +21,7 @@
#include <boost/format.hpp>
#include <boost/algorithm/string/join.hpp>
#include <boost/scoped_array.hpp>
#include <errno.h>
#include <iostream>
#include <signal.h>
#include <stdio.h>

View file

@ -24,6 +24,7 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <dbus/dbus.h>
#include <errno.h>
#include "helper.hpp"
#include "raise_exception.hpp"