Techwizz/xboxdrv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed --no-uinput

Browse source
This commit is contained in:
Ingo Ruhnke 2011-01-26 17:21:42 +01:00
parent d6f232c548
commit c0891ef16d
2 changed files with 17 additions and 8 deletions

2
src/dummy_message_processor.cpp
View file

@ -28,7 +28,7 @@ DummyMessageProcessor::DummyMessageProcessor()
void
DummyMessageProcessor::send(const XboxGenericMsg& msg, int msec_delta)
{
log_info << msg << std::endl;
// do nothing as the XboxdrvThread is already doing the printing
}
void

23
src/xboxdrv.cpp
View file

@ -24,6 +24,7 @@
#include <stdio.h>
#include "command_line_options.hpp"
#include "dummy_message_processor.hpp"
#include "default_message_processor.hpp"
#include "evdev_controller.hpp"
#include "helper.hpp"
@ -456,15 +457,23 @@ Xboxdrv::run_main(const Options& opts)
global_exit_xboxdrv = false;
ControllerSlotConfigPtr config_set = ControllerSlotConfig::create(*uinput,
0, opts.extra_devices,
opts.get_controller_slot());
std::auto_ptr<MessageProcessor> message_proc;
if (uinput.get())
{
ControllerSlotConfigPtr config_set = ControllerSlotConfig::create(*uinput,
0, opts.extra_devices,
opts.get_controller_slot());
// After all the ControllerConfig registered their events, finish up
// the device creation
uinput->finish();
// After all the ControllerConfig registered their events, finish up
// the device creation
uinput->finish();
std::auto_ptr<MessageProcessor> message_proc(new DefaultMessageProcessor(*uinput, config_set, opts));
message_proc.reset(new DefaultMessageProcessor(*uinput, config_set, opts));
}
else
{
message_proc.reset(new DummyMessageProcessor);
}
XboxdrvThread loop(message_proc, controller, opts);
loop.controller_loop(opts);