mirror of
https://github.com/mapmapteam/mapmap.git
synced 2026-06-16 12:33:19 +02:00
Remove stale liblo references
OSC support now uses the bundled oscpack library, not liblo. Remove all leftover liblo references from source, CI configs, and docs. Also fixes a memory leak: osc_timer deletion was guarded by HAVE_OSC which was never defined.
This commit is contained in:
@@ -17,7 +17,7 @@ jobs:
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
brew install qt liblo
|
||||
brew install qt
|
||||
|
||||
- name: Configure with qmake
|
||||
run: |
|
||||
|
||||
@@ -20,8 +20,6 @@ jobs:
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y \
|
||||
build-essential \
|
||||
liblo-dev \
|
||||
liblo-tools \
|
||||
libqt6opengl6-dev \
|
||||
libqt6openglwidgets6 \
|
||||
pkg-config \
|
||||
|
||||
+1
-2
@@ -34,12 +34,11 @@ install:
|
||||
sudo apt-get install -y
|
||||
qt6-base-dev qt6-tools-dev qt6-multimedia-dev
|
||||
libqt6opengl6-dev libqt6openglwidgets6
|
||||
liblo-dev liblo-tools
|
||||
ccache;
|
||||
fi
|
||||
|
||||
- if [ "$TARGET" == "osx" ]; then
|
||||
brew install qt liblo ccache;
|
||||
brew install qt ccache;
|
||||
export PATH="$(brew --prefix qt)/bin:$PATH";
|
||||
export PATH="/usr/local/opt/ccache/libexec:$PATH";
|
||||
fi
|
||||
|
||||
+3
-4
@@ -21,11 +21,10 @@ Alternatively:
|
||||
|
||||
### Ubuntu
|
||||
|
||||
Install basic development tools for Qt 6 projects, plus liblo for OSC support:
|
||||
Install basic development tools for Qt 6 projects:
|
||||
|
||||
```
|
||||
sudo apt-get install -y \
|
||||
liblo-dev liblo-tools \
|
||||
qt6-tools-dev \
|
||||
qt6-multimedia-dev \
|
||||
qt6-base-dev \
|
||||
@@ -45,10 +44,10 @@ sudo apt-get install -y \
|
||||
|
||||
### Arch Linux
|
||||
|
||||
Install basic development tools for Qt 6 projects and liblo for OSC support:
|
||||
Install basic development tools for Qt 6 projects:
|
||||
|
||||
```
|
||||
sudo pacman -S qt6-tools qt6-multimedia qt6-base liblo
|
||||
sudo pacman -S qt6-tools qt6-multimedia qt6-base
|
||||
```
|
||||
|
||||
Build on macOS
|
||||
|
||||
@@ -27,5 +27,4 @@ You might consider using:
|
||||
|
||||
* The txosc library for python. It contains osc-send
|
||||
* The oscsend utility
|
||||
* The liblo C library
|
||||
|
||||
|
||||
+1
-4
@@ -25,8 +25,5 @@
|
||||
*
|
||||
* \section install_sec Installation
|
||||
*
|
||||
* liblo-dev
|
||||
* qttools5-dev-tools
|
||||
* qt5-default
|
||||
* ./build.sh
|
||||
* See INSTALL.md for build instructions.
|
||||
*/
|
||||
|
||||
@@ -125,12 +125,9 @@ void AboutDialog::createLibrariesTab()
|
||||
librariesTextBrowser->setOpenExternalLinks(true);
|
||||
|
||||
QString qtVersionText = QString("<h4>Qt %1</h4>").arg(QT_VERSION_STR);
|
||||
// TODO: ifdef HAVE_OSC
|
||||
//QString libloVersionText = QString("<h4>%1</h4>").arg(lo_version('str', 0, 0, 0, 0, 0, 0, 0, 0));
|
||||
|
||||
QString librairiesText;
|
||||
librairiesText.append(qtVersionText);
|
||||
//librairiesText.append(libloVersionText);
|
||||
|
||||
// Set librairies main text
|
||||
librariesTextBrowser->setText(librairiesText);
|
||||
|
||||
@@ -22,10 +22,6 @@
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
#ifdef HAVE_OSC
|
||||
#include "lo/lo.h"
|
||||
#endif
|
||||
|
||||
#include "GuiForward.h"
|
||||
#include "MM.h"
|
||||
|
||||
|
||||
@@ -114,9 +114,7 @@ MainWindow::~MainWindow()
|
||||
{
|
||||
delete mappingManager;
|
||||
// delete _facade;
|
||||
#ifdef HAVE_OSC
|
||||
delete osc_timer;
|
||||
#endif // ifdef
|
||||
delete systemTimer;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user