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

Moved force feedback output into verbose

Browse source
This commit is contained in:
Ingo Ruhnke 2009-01-25 12:18:09 +01:00
parent 419e597047
commit 487ff84db8
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TODO
View file

@ -26,8 +26,6 @@ Stuff to do before 0.5 release:
requirements for each device.
* add a way to not create a joystick/event device
* make force feedback debug output optional (maybe later, doesn't seem to hurt and helps debugging)
fixme:dinput:joy_polldev joystick cannot handle type 21 event (code 0) <- 21 == EV_FF (status report?)

29
src/force_feedback_handler.cpp
View file

@ -19,6 +19,7 @@
#include <stdlib.h>
#include <iostream>
#include <assert.h>
#include "command_line_options.hpp"
#include "force_feedback_handler.hpp"
std::ostream& operator<<(std::ostream& out, const struct ff_envelope& envelope)
@ -183,7 +184,7 @@ ForceFeedbackEffect::ForceFeedbackEffect(const struct ff_effect& effect)
// case FF_FRICTION:
// case FF_DAMPER
// case FF_INERTIA:
std::cout << "Unsupported effect" << std::endl;
std::cout << "Unsupported effect: " << effect << std::endl;
start_weak_magnitude = 0;
start_strong_magnitude = 0;
end_weak_magnitude = 0;
@ -278,11 +279,12 @@ ForceFeedbackHandler::get_max_effects()
void
ForceFeedbackHandler::upload(const struct ff_effect& effect)
{
std::cout << "FF_UPLOAD("
<< "effect_id:" << effect.id
<< ", effect_type:" << effect.type
<< ",\n " << effect
<< ")" << std::endl;
if (command_line_options->verbose)
std::cout << "FF_UPLOAD("
<< "effect_id:" << effect.id
<< ", effect_type:" << effect.type
<< ",\n " << effect
<< ")" << std::endl;
std::map<int, ForceFeedbackEffect>::iterator i = effects.find(effect.id);
if (i == effects.end())
@ -308,37 +310,40 @@ ForceFeedbackHandler::upload(const struct ff_effect& effect)
void
ForceFeedbackHandler::erase(int id)
{
std::cout << "FF_ERASE(effect_id:" << id << ")" << std::endl;
if (command_line_options->verbose)
std::cout << "FF_ERASE(effect_id:" << id << ")" << std::endl;
std::map<int, ForceFeedbackEffect>::iterator i = effects.find(id);
if (i != effects.end())
effects.erase(i);
else
std::cout << "ForceFeedbackHandler::erase: Unknown id " << id << std::endl;
std::cout << "Error: ForceFeedbackHandler::erase: Unknown id " << id << std::endl;
}
void
ForceFeedbackHandler::play(int id)
{
std::cout << "FFPlay(effect_id:" << id << ")" << std::endl;
if (command_line_options->verbose)
std::cout << "FFPlay(effect_id:" << id << ")" << std::endl;
std::map<int, ForceFeedbackEffect>::iterator i = effects.find(id);
if (i != effects.end())
i->second.play();
else
std::cout << "ForceFeedbackHandler::play: Unknown id " << id << std::endl;
std::cout << "Error: ForceFeedbackHandler::play: Unknown id " << id << std::endl;
}
void
ForceFeedbackHandler::stop(int id)
{
std::cout << "FFStop(effect_id:" << id << ")" << std::endl;
if (command_line_options->verbose)
std::cout << "FFStop(effect_id:" << id << ")" << std::endl;
std::map<int, ForceFeedbackEffect>::iterator i = effects.find(id);
if (i != effects.end())
i->second.stop();
else
std::cout << "ForceFeedbackHandler::play: Unknown id " << id << std::endl;
std::cout << "Error: ForceFeedbackHandler::play: Unknown id " << id << std::endl;
}
void