tza/openauto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working version

Browse Source
This commit is contained in:
tza 2025-04-20 20:05:20 +00:00
parent 9f3135066d
commit e3f4b852a1
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -90,7 +90,7 @@ find_package(aap_protobuf REQUIRED)
find_package(aasdk REQUIRED) find_package(aasdk REQUIRED)
find_package(Boost REQUIRED COMPONENTS system log_setup log OPTIONAL_COMPONENTS unit_test_framework) find_package(Boost REQUIRED COMPONENTS system log_setup log OPTIONAL_COMPONENTS unit_test_framework)
find_package(libusb-1.0 REQUIRED) find_package(libusb-1.0 REQUIRED)
find_package(Qt5 COMPONENTS DBus Multimedia MultimediaWidgets Bluetooth Network) find_package(Qt5 REQUIRED COMPONENTS DBus Multimedia MultimediaWidgets Bluetooth Network WebSockets)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
find_package(rtaudio REQUIRED) find_package(rtaudio REQUIRED)
find_package(taglib REQUIRED) find_package(taglib REQUIRED)
@ -130,6 +130,7 @@ target_include_directories(autoapp PUBLIC ${AAP_PROTOBUF_INCLUDE_DIR} ${AASDK_IN
target_link_libraries(autoapp PUBLIC target_link_libraries(autoapp PUBLIC
libusb libusb
Qt5::WebSockets
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${Qt5DBus_LIBRARIES} ${Qt5DBus_LIBRARIES}
${Qt5Multimedia_LIBRARIES} ${Qt5Multimedia_LIBRARIES}
@ -174,4 +175,4 @@ set_target_properties(autoapp
#install(TARGETS autoapp btservice #install(TARGETS autoapp btservice
# EXPORT aasdkTargets # EXPORT aasdkTargets
# RUNTIME DESTINATION bin # RUNTIME DESTINATION bin
#) #)

2
include/f1x/openauto/autoapp/UI/MainWindow.hpp
View File

@ -41,6 +41,7 @@
#include <taglib/fileref.h> #include <taglib/fileref.h>
#include <taglib/tag.h> #include <taglib/tag.h>
#include <QtWebSockets/QWebSocket>
#include <QFileSystemWatcher> #include <QFileSystemWatcher>
#include <QKeyEvent> #include <QKeyEvent>
@ -266,6 +267,7 @@ namespace f1x
QBluetoothLocalDevice *localDevice; QBluetoothLocalDevice *localDevice;
QWebSocket *webSocket; QWebSocket *webSocket;
QTimer *reconnectTimer; QTimer *reconnectTimer;
bool shuttingDown;
protected: protected:
void keyPressEvent(QKeyEvent *event); void keyPressEvent(QKeyEvent *event);

2
src/autoapp/UI/MainWindow.cpp
View File

@ -32,7 +32,7 @@
#include <QVideoWidget> #include <QVideoWidget>
#include <QNetworkInterface> #include <QNetworkInterface>
#include <QStandardItemModel> #include <QStandardItemModel>
#include <QWebSocket> #include <QtWebSockets/QWebSocket>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <cstdio> #include <cstdio>