eessppeelllloo/Acid.Cam.v2.Qt
1
0
Fork 0
mirror of https://github.com/lostjared/Acid.Cam.v2.Qt.git synced 2025-12-05 14:30:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated project now outputs controller name to log

Browse Source
This commit is contained in:
Jared Bruni
2020-02-21 17:24:10 -08:00
parent e987a61ac1
commit 87025606c0
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/controller.cpp
View File

@@ -11,6 +11,11 @@ bool Controller::open(int index) {
return true;
}
const char *Controller::getControllerName() {
const char *text = SDL_JoystickName(stick);
return text;
}
void Controller::close() {
if(stick != 0)
SDL_JoystickClose(stick);

1
src/controller.h
View File

@@ -16,6 +16,7 @@ public:
bool button(int index);
Uint8 hat(int h);
int axis(int index);
const char *getControllerName();
private:
SDL_Joystick *stick;

23
src/main_window.cpp
View File

@@ -176,12 +176,15 @@ AC_MainWindow::AC_MainWindow(QWidget *parent) : QMainWindow(parent) {
Controller::init();
joy_timer = new QTimer(this);
connect(joy_timer, SIGNAL(timeout()), this, SLOT(chk_Joystick()));
QString out_text;
QTextStream stream(&out_text);
if(controller.open(0)) {
std::cout << "Controller connected...\n";
stream << "Controller: " << controller.getControllerName() << " connected...\n";
joy_timer->start();
} else {
std::cout << "No controller detected...\n";
stream << "No controller detected...\n";
}
Log(out_text);
}
@@ -1055,14 +1058,15 @@ bool AC_MainWindow::startCamera(int res, int dev, const QString &outdir, bool re
if(rt_val == false) return false;
playback->Play();
disp->show();
QString out_text;
QTextStream stream(&out_text);
if(controller.open(0)) {
std::cout << "Controller connected...\n";
stream << "Controller: " << controller.getControllerName() << " connected...\n";
joy_timer->start();
} else {
std::cout << "No controller detected...\n";
stream << "No controller detected...\n";
}
Log(out_text);
return true;
}
@@ -1161,12 +1165,15 @@ bool AC_MainWindow::startVideo(const QString &filename, const QString &outdir, b
playback->setVideo(capture_video,writer,recording);
playback->Play();
disp->show();
QString out_text;
QTextStream streamx(&out_text);
if(controller.open(0)) {
std::cout << "Controller connected...\n";
streamx << "Controller: " << controller.getControllerName() << " connected...\n";
joy_timer->start();
} else {
std::cout << "No controller detected...\n";
streamx << "No controller detected...\n";
}
Log(out_text);
return true;
}