[sc9k] Fix to SlideView to use correct signal from QListWidget

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/misc.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompDBSettings">
+    <option name="linkedExternalProjectsSettings">
+      <CompDBProjectSettings>
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+      </CompDBProjectSettings>
+    </option>
+  </component>
+  <component name="CompDBWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.liccor.yml

@@ -0,0 +1,9 @@
+---
+source:
+- .
+copyright_notice: |-
+  Copyright 2021 gary@drinkingtea.net
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.

CMakeLists.txt

@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.19)
+set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19
+
+project(SlideController)
+
+include(deps/buildcore/base.cmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QTDIR})
+
+if(NOT MSVC)
+	# enable warnings
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion")
+endif()
+
+set(CMAKE_INSTALL_RPATH "$ORIGIN" "$ORIGIN/../")
+if(QTDIR)
+	set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} "${QTDIR}/lib")
+endif()
+set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+
+add_subdirectory(src)

Makefile

@@ -0,0 +1,17 @@
+PROJECT_NAME=SlideController
+BUILDCORE_PATH=deps/buildcore
+VCPKG_PKGS=
+include ${BUILDCORE_PATH}/base.mk
+
+ifeq ($(OS),darwin)
+	PROJECT_EXECUTABLE=./dist/${CURRENT_BUILD}/${PROJECT_NAME}.app/Contents/MacOS/SlideController
+else
+	PROJECT_EXECUTABLE=./dist/${CURRENT_BUILD}/bin/SlideController
+endif
+
+.PHONY: run
+run: install
+	${ENV_RUN} ${PROJECT_EXECUTABLE}
+.PHONY: debug
+debug: install
+	${ENV_RUN} gdb --args ${PROJECT_EXECUTABLE}

SlideController.pro

@@ -1,27 +0,0 @@
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += network widgets
-
-CONFIG += c++17
-
-# You can make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-SOURCES += \
-    main.cpp \
-    mainwindow.cpp \
-    obsclient.cpp \
-    openlpclient.cpp \
-    slideview.cpp
-
-HEADERS += \
-    mainwindow.hpp \
-    obsclient.hpp \
-    openlpclient.hpp \
-    slideview.hpp
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target

deps/buildcore/.gitignore

@@ -0,0 +1,4 @@
+scripts/__pycache__
+CMakeLists.txt.user
+Session.vim
+graph_info.json

deps/buildcore/LICENSE

@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

deps/buildcore/base.cmake

@@ -0,0 +1,63 @@
+
+set(QTDIR "" CACHE PATH "Path to Qt Libraries")
+
+set(BUILDCORE_TARGET "Native" CACHE STRING "The type of build to produce(Native/GBA)")
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/modules)
+include(GenerateExportHeader)
+include(address_sanitizer)
+
+set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/dist/${BUILDCORE_BUILD_CONFIG}")
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+# enable ccache
+if(NOT DEFINED ENV{BUILDCORE_SUPPRESS_CCACHE})
+	find_program(CCACHE_PROGRAM ccache)
+	if(CCACHE_PROGRAM)
+		 set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+	endif()
+endif()
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+	add_definitions(-DDEBUG)
+else()
+	add_definitions(-DNDEBUG)
+	if(APPLE)
+		set(CMAKE_OSX_ARCHITECTURES arm64;x86_64)
+	endif()
+endif()
+
+if(MSVC)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:preprocessor")
+else()
+	# forces colored output when using ninja
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color")
+	# enable warnings
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdouble-promotion")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=2")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wmissing-field-initializers")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor")
+	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnull-dereference")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-compare")
+	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-variable")
+	# release build options
+	if (CMAKE_BUILD_TYPE STREQUAL "Release")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+	endif()
+endif()
+
+enable_testing()
+

deps/buildcore/base.mk

@@ -0,0 +1,164 @@
+#
+#  Copyright 2016 - 2021 gary@drinkingtea.net
+#
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+ifeq (${OS},Windows_NT)
+	SHELL := powershell.exe
+	.SHELLFLAGS := -NoProfile -Command
+	OS=windows
+	HOST_ENV=${OS}
+else
+	OS=$(shell uname | tr [:upper:] [:lower:])
+	HOST_ENV=${OS}-$(shell uname -m)
+endif
+
+DEVENV=devenv$(shell pwd | sed 's/\//-/g')
+DEVENV_IMAGE=${PROJECT_NAME}-devenv
+ifneq ($(shell which docker 2> /dev/null),)
+	ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
+		ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV}
+	endif
+endif
+
+ifneq ($(shell which python3 2> /dev/null),)
+	PYTHON3=python3
+else
+	ifeq ($(shell ${ENV_RUN} python -c 'import sys; print(sys.version_info[0])'),3)
+		PYTHON3=python
+	endif
+endif
+
+SCRIPTS=${BUILDCORE_PATH}/scripts
+SETUP_BUILD=${PYTHON3} ${SCRIPTS}/setup-build.py
+PYBB=${PYTHON3} ${SCRIPTS}/pybb.py
+CMAKE_BUILD=${PYBB} cmake-build
+CTEST=${PYBB} ctest-all
+RM_RF=${PYBB} rm
+ifdef USE_VCPKG
+	ifndef VCPKG_DIR_BASE
+		VCPKG_DIR_BASE=.vcpkg
+	endif
+	ifndef VCPKG_VERSION
+		VCPKG_VERSION=2020.06
+	endif
+	VCPKG_TOOLCHAIN=--toolchain=${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake
+endif
+ifeq ($(OS),darwin)
+	DEBUGGER=lldb --
+else
+	DEBUGGER=gdb --args
+endif
+
+VCPKG_DIR=$(VCPKG_DIR_BASE)/$(VCPKG_VERSION)-$(HOST_ENV)
+CURRENT_BUILD=$(HOST_ENV)-$(shell ${PYBB} cat .current_build)
+
+.PHONY: build
+build:
+	${ENV_RUN} ${CMAKE_BUILD} build
+.PHONY: install
+install:
+	${ENV_RUN} ${CMAKE_BUILD} build install
+.PHONY: clean
+clean:
+	${ENV_RUN} ${CMAKE_BUILD} build clean
+.PHONY: purge
+purge:
+	${ENV_RUN} ${RM_RF} .current_build
+	${ENV_RUN} ${RM_RF} build
+	${ENV_RUN} ${RM_RF} dist
+.PHONY: test
+test: build
+	${ENV_RUN} ${CMAKE_BUILD} build test
+.PHONY: test-verbose
+test-verbose: build
+	${ENV_RUN} ${CTEST} build --output-on-failure
+.PHONY: test-rerun-verbose
+test-rerun-verbose: build
+	${ENV_RUN} ${CTEST} build --rerun-failed --output-on-failure
+
+.PHONY: devenv-image
+devenv-image:
+	docker build . -t ${DEVENV_IMAGE}
+.PHONY: devenv-create
+devenv-create:
+	docker run -d \
+		-e LOCAL_USER_ID=$(shell id -u ${USER}) \
+		-e DISPLAY=$(DISPLAY) \
+		-e QT_AUTO_SCREEN_SCALE_FACTOR=1 \
+		-v /tmp/.X11-unix:/tmp/.X11-unix \
+		-v /run/dbus/:/run/dbus/ \
+		-v $(shell pwd):/usr/src/project \
+		-v /dev/shm:/dev/shm \
+		--restart=always \
+		--name ${DEVENV} \
+		-t ${DEVENV_IMAGE} bash
+.PHONY: devenv-destroy
+devenv-destroy:
+	docker rm -f ${DEVENV}
+ifdef ENV_RUN
+.PHONY: devenv-shell
+devenv-shell:
+	${ENV_RUN} bash
+endif
+
+ifdef USE_VCPKG
+
+.PHONY: vcpkg
+vcpkg: ${VCPKG_DIR} vcpkg-install
+
+${VCPKG_DIR}:
+	${ENV_RUN} ${RM_RF} ${VCPKG_DIR}
+	${ENV_RUN} mkdir -p ${VCPKG_DIR_BASE}
+	${ENV_RUN} git clone -b release --depth 1 --branch ${VCPKG_VERSION} https://github.com/microsoft/vcpkg.git ${VCPKG_DIR}
+ifneq (${OS},windows)
+	${ENV_RUN} ${VCPKG_DIR}/bootstrap-vcpkg.sh
+else
+	${ENV_RUN} ${VCPKG_DIR}/bootstrap-vcpkg.bat
+endif
+
+.PHONY: vcpkg-install
+vcpkg-install:
+ifneq (${OS},windows)
+	${VCPKG_DIR}/vcpkg install ${VCPKG_PKGS}
+else
+	${VCPKG_DIR}/vcpkg install --triplet x64-windows ${VCPKG_PKGS}
+endif
+
+else ifdef USE_CONAN # USE_VCPKG ################################################
+
+.PHONY: setup-conan
+conan-config:
+	${ENV_RUN} conan profile new ${PROJECT_NAME} --detect --force
+ifeq ($(OS),linux)
+	${ENV_RUN} conan profile update settings.compiler.libcxx=libstdc++11 ${PROJECT_NAME}
+else
+	${ENV_RUN} conan profile update settings.compiler.cppstd=20 ${PROJECT_NAME}
+ifeq ($(OS),windows)
+	${ENV_RUN} conan profile update settings.compiler.runtime=static ${PROJECT_NAME}
+endif
+endif
+.PHONY: conan
+conan:
+	${ENV_RUN} ${PYBB} conan-install ${PROJECT_NAME}
+endif # USE_VCPKG ###############################################
+
+.PHONY: configure-xcode
+configure-xcode:
+	${ENV_RUN} ${SETUP_BUILD} ${VCPKG_TOOLCHAIN} --build_tool=xcode --current_build=0
+
+.PHONY: configure-release
+configure-release:
+	${ENV_RUN} ${SETUP_BUILD} ${VCPKG_TOOLCHAIN} --build_type=release
+
+.PHONY: configure-debug
+configure-debug:
+	${ENV_RUN} ${SETUP_BUILD} ${VCPKG_TOOLCHAIN} --build_type=debug
+
+.PHONY: configure-asan
+configure-asan:
+	${ENV_RUN} ${SETUP_BUILD} ${VCPKG_TOOLCHAIN} --build_type=asan
+

deps/buildcore/cmake/modules/Mingw.cmake

@@ -0,0 +1,18 @@
+set(CMAKE_SYSTEM_NAME Windows)
+set(TOOLCHAIN_PREFIX x86_64-w64-mingw32)
+
+# cross compilers to use for C and C++
+set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
+set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
+set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
+
+# target environment on the build host system
+#   set 1st to dir with the cross compiler's C/C++ headers/libs
+set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
+
+# modify default behavior of FIND_XXX() commands to
+# search for headers/libs in the target environment and
+# search for programs in the build host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

deps/buildcore/cmake/modules/address_sanitizer.cmake

@@ -0,0 +1,52 @@
+# This file belongs Nick Overdijk, and is from https://github.com/NickNick/wubwubcmake
+# The MIT License (MIT)
+# 
+# Copyright (c) 2013 Nick Overdijk
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.option(USE_ASAN "Enable Address Sanitizer, if your compiler supports it" ON)
+
+option(USE_ASAN "Enable Address Sanitizer, if your compiler supports it" OFF)
+if(USE_ASAN)
+	include(CheckCXXSourceCompiles)
+	# If the compiler understands -fsanitize=address, add it to the flags (gcc since 4.8 & clang since version 3.2)
+	set(CMAKE_REQUIRED_FLAGS_BAK "${CMAKE_REQUIRED_FLAGS}")
+	set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fsanitize=address")
+	CHECK_CXX_SOURCE_COMPILES("int main() { return 0; }" FLAG_FSANA_SUPPORTED)
+	set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS_BAK}")
+
+	if(FLAG_FSANA_SUPPORTED)
+		set(asan_flag "-fsanitize=address")
+	else(FLAG_FSANA_SUPPORTED)
+		# Alternatively, try if it understands -faddress-sanitizer (clang until version 3.2)
+		set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -faddress-sanitizer")
+		CHECK_CXX_SOURCE_COMPILES("int main() { return 0; }" FLAG_FASAN_SUPPORTED)
+		set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS_BAK}")
+
+		if(FLAG_FASAN_SUPPORTED)
+			set(asan_flag "-faddress-sanitizer")
+		endif(FLAG_FASAN_SUPPORTED)
+	endif(FLAG_FSANA_SUPPORTED)
+
+	if(FLAG_FSANA_SUPPORTED OR FLAG_FASAN_SUPPORTED)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${asan_flag}")
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${asan_flag}")
+		set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${asan_flag}")
+		set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${asan_flag}")
+	endif()
+
+endif(USE_ASAN)

deps/buildcore/scripts/pybb.py

@@ -0,0 +1,123 @@
+#! /usr/bin/env python3
+
+#
+#  Copyright 2016 - 2021 gary@drinkingtea.net
+#
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# "Python Busy Box" - adds cross-platform equivalents to Unix commands that
+#                     don't translate well to that other operating system
+
+import os
+import shutil
+import subprocess
+import sys
+
+
+def cat(paths: [str]) -> int:
+    for path in paths:
+        try:
+            with open(path) as f:
+                data = f.read()
+                sys.stdout.write(data)
+        except FileNotFoundError:
+            sys.stderr.write('cat: {}: no such file or directory\n'.format(path))
+            return 1
+    sys.stdout.write('\n')
+    return 0
+
+
+def mkdir(path: str) -> int:
+    if not os.path.exists(path):
+        try:
+            os.mkdir(path)
+        except:
+            return 1
+        return 0
+    if os.path.isdir(path):
+        return 0
+    return 1
+
+
+# this exists because Windows is utterly incapable of providing a proper rm -rf
+def rm(path: str) -> int:
+    if (os.path.exists(path) or os.path.islink(path)) and not os.path.isdir(path):
+        os.remove(path)
+    elif os.path.isdir(path):
+        shutil.rmtree(path)
+    return 0
+
+
+def ctest_all() -> int:
+    base_path = sys.argv[2]
+    if not os.path.isdir(base_path):
+        # no generated projects
+        return 0
+    args = ['ctest'] + sys.argv[3:]
+    orig_dir = os.getcwd()
+    for d in os.listdir(base_path):
+        os.chdir(os.path.join(orig_dir, base_path, d))
+        err = subprocess.run(args).returncode
+        if err != 0:
+            return err
+    return 0
+
+
+def cmake_build(base_path: str, target: str) -> int:
+    if not os.path.isdir(base_path):
+        # nothing to build
+        return 0
+    for d in os.listdir(base_path):
+        args = ['cmake', '--build', os.path.join(base_path, d)]
+        if target is not None:
+            args.extend(['--target', target])
+        err = subprocess.run(args).returncode
+        if err != 0:
+            return err
+    return 0
+
+
+def conan() -> int:
+    project_name = sys.argv[2]
+    conan_dir = '.conanbuild'
+    err = mkdir(conan_dir)
+    if err != 0:
+        return err
+    args = ['conan', 'install', '../', '--build=missing', '-pr', project_name]
+    os.chdir(conan_dir)
+    err = subprocess.run(args).returncode
+    if err != 0:
+        return err
+    return 0
+
+
+def main():
+    err = 0
+    if sys.argv[1] == 'mkdir':
+        err = mkdir(sys.argv[2])
+    elif sys.argv[1] == 'rm':
+        for i in range(2, len(sys.argv)):
+            rm(sys.argv[i])
+    elif sys.argv[1] == 'conan-install':
+        err = conan()
+    elif sys.argv[1] == 'ctest-all':
+        err = ctest_all()
+    elif sys.argv[1] == 'cmake-build':
+        err = cmake_build(sys.argv[2], sys.argv[3] if len(sys.argv) > 3 else None)
+    elif sys.argv[1] == 'cat':
+        err = cat(sys.argv[2:])
+    else:
+        sys.stderr.write('Command not found\n')
+        err = 1
+    return err
+
+
+if __name__ == '__main__':
+    try:
+        err = main()
+        sys.exit(err)
+    except KeyboardInterrupt:
+        sys.exit(1)

deps/buildcore/scripts/setup-build.py

@@ -0,0 +1,100 @@
+#! /usr/bin/env python3
+
+#
+#  Copyright 2016 - 2021 gary@drinkingtea.net
+#
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+import argparse
+import os
+import platform
+import shutil
+import subprocess
+import sys
+
+from pybb import mkdir, rm
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--target', help='Platform target',
+                        default='{:s}-{:s}'.format(sys.platform, platform.machine()))
+    parser.add_argument('--build_type', help='Build type (asan,debug,release)', default='release')
+    parser.add_argument('--build_tool', help='Build tool (default,xcode)', default='')
+    parser.add_argument('--toolchain', help='Path to CMake toolchain file', default='')
+    parser.add_argument('--current_build', help='Indicates whether or not to make this the active build', default=1)
+    args = parser.parse_args()
+
+    if args.build_type == 'asan':
+        build_type_arg = 'Debug'
+        sanitizer_status = 'ON'
+    elif args.build_type == 'debug':
+        build_type_arg = 'Debug'
+        sanitizer_status = 'OFF'
+    elif args.build_type == 'release':
+        build_type_arg = 'Release'
+        sanitizer_status = 'OFF'
+    else:
+        print('Error: Invalid build tool')
+        sys.exit(1)
+
+    if args.build_tool == 'xcode':
+        build_config = '{:s}-{:s}'.format(args.target, args.build_tool)
+    else:
+        build_config = '{:s}-{:s}'.format(args.target, args.build_type)
+
+    if 'QTDIR' in os.environ:
+        qt_path = '-DQTDIR={:s}'.format(os.environ['QTDIR'])
+    else:
+        qt_path = ''
+
+    if args.build_tool == '' or args.build_tool == 'default':
+        if shutil.which('ninja') is None:
+            build_tool = ''
+        else:
+            build_tool = '-GNinja'
+    elif args.build_tool == 'xcode':
+        build_tool = '-GXcode'
+    else:
+        print('Error: Invalid build tool')
+        sys.exit(1)
+
+    project_dir = os.getcwd()
+    build_dir = '{:s}/build/{:s}'.format(project_dir, build_config)
+    rm(build_dir)
+    mkdir(build_dir)
+    cmake_cmd = [
+        'cmake', '-S', project_dir, '-B', build_dir, build_tool,
+        '-DCMAKE_EXPORT_COMPILE_COMMANDS=ON',
+        '-DCMAKE_TOOLCHAIN_FILE={:s}'.format(args.toolchain),
+        '-DCMAKE_BUILD_TYPE={:s}'.format(build_type_arg),
+        '-DUSE_ASAN={:s}'.format(sanitizer_status),
+        '-DBUILDCORE_BUILD_CONFIG={:s}'.format(build_config),
+        '-DBUILDCORE_TARGET={:s}'.format(args.target),
+    ]
+    if qt_path != '':
+        cmake_cmd.append(qt_path)
+    if platform.system() == 'Windows':
+        cmake_cmd.append('-A x64')
+
+    subprocess.run(cmake_cmd)
+
+    mkdir('dist')
+    if int(args.current_build) != 0:
+        cb = open('.current_build', 'w')
+        cb.write(args.build_type)
+        cb.close()
+
+    rm('compile_commands.json')
+    if platform.system() != 'Windows':
+        os.symlink('build/{:s}/compile_commands.json'.format(build_config), 'compile_commands.json')
+
+
+if __name__ == '__main__':
+    try:
+        main()
+    except KeyboardInterrupt:
+        sys.exit(1)

main.cpp

@@ -1,10 +0,0 @@
-#include "mainwindow.hpp"
-
-#include <QApplication>
-
-int main(int argc, char *argv[]) {
-	QApplication a(argc, argv);
-	MainWindow w;
-	w.show();
-	return a.exec();
-}

mainwindow.cpp

@@ -1,71 +0,0 @@
-#include <QFormLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QVBoxLayout>
-
-#include "slideview.hpp"
-#include "mainwindow.hpp"
-
-MainWindow::MainWindow(QWidget *parent): QMainWindow(parent) {
-	move(0, 0);
-	setFixedSize(590, 555);
-	setWindowTitle(tr("Slide Controller 9000"));
-	const auto mainWidget = new QWidget(this);
-	const auto rootLyt = new QVBoxLayout;
-	//const auto viewsLayout = new QHBoxLayout;
-	const auto controlsLayout = new QGridLayout;
-	const auto slideView = new SlideView(this);
-	setCentralWidget(mainWidget);
-	mainWidget->setLayout(rootLyt);
-	rootLyt->addWidget(slideView);
-	rootLyt->addLayout(controlsLayout);
-	// setup slide controls
-	const auto btnPrevSong = new QPushButton(tr("Previous Song (Left)"), this);
-	const auto btnPrevSlide = new QPushButton(tr("Previous Slide (Up)"), this);
-	const auto btnNextSlide = new QPushButton(tr("Next Slide (Down)"), this);
-	const auto btnNextSong = new QPushButton(tr("Next Song (Right))"), this);
-	const auto btnBlankSlides = new QPushButton(tr("Blank Slides (,)"), this);
-	const auto btnShowSlides = new QPushButton(tr("Show Slides (.)"), this);
-	rootLyt->addLayout(controlsLayout);
-	controlsLayout->addWidget(btnPrevSlide, 0, 0);
-	controlsLayout->addWidget(btnNextSlide, 0, 1);
-	controlsLayout->addWidget(btnPrevSong, 1, 0);
-	controlsLayout->addWidget(btnNextSong, 1, 1);
-	controlsLayout->addWidget(btnBlankSlides, 2, 0);
-	controlsLayout->addWidget(btnShowSlides, 2, 1);
-	btnNextSong->setShortcut(Qt::Key_Right);
-	btnPrevSong->setShortcut(Qt::Key_Left);
-	btnNextSlide->setShortcut(Qt::Key_Down);
-	btnPrevSlide->setShortcut(Qt::Key_Up);
-	btnBlankSlides->setShortcut(Qt::Key_Comma);
-	btnShowSlides->setShortcut(Qt::Key_Period);
-	btnBlankSlides->setToolTip(tr("Also hides slides in OBS"));
-	connect(btnNextSlide, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::nextSlide);
-	connect(btnPrevSlide, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::prevSlide);
-	connect(btnNextSong, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::nextSong);
-	connect(btnPrevSong, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::prevSong);
-	connect(btnBlankSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::blankScreen);
-	connect(btnBlankSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);
-	connect(btnShowSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::showSlides);
-	connect(&m_openlpClient, &OpenLPClient::pollUpdate, slideView, &SlideView::pollUpdate);
-	connect(&m_openlpClient, &OpenLPClient::songListUpdate, slideView, &SlideView::songListUpdate);
-	connect(&m_openlpClient, &OpenLPClient::slideListUpdate, slideView, &SlideView::slideListUpdate);
-	connect(slideView, &SlideView::songChanged, &m_openlpClient, &OpenLPClient::changeSong);
-	connect(slideView, &SlideView::slideChanged, &m_openlpClient, &OpenLPClient::changeSlide);
-	// setup scene selector
-	const auto btnObsHideSlides = new QPushButton(tr("Hide Slides in OBS (;)"), mainWidget);
-	const auto btnObsShowSlides = new QPushButton(tr("Show Slides in OBS (')"), mainWidget);
-	controlsLayout->addWidget(btnObsHideSlides, 3, 0);
-	controlsLayout->addWidget(btnObsShowSlides, 3, 1);
-	btnObsHideSlides->setShortcut(Qt::Key_Semicolon);
-	btnObsShowSlides->setShortcut(Qt::Key_Apostrophe);
-	btnObsShowSlides->setToolTip(tr("Also shows slides in OpenLP"));
-	connect(btnObsHideSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);
-	connect(btnObsShowSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::showSlides);
-	connect(btnObsShowSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::showSlides);
-}
-
-MainWindow::~MainWindow() {
-}

mainwindow.hpp

@@ -1,21 +0,0 @@
-#pragma once
-
-#include <QMainWindow>
-
-#include "obsclient.hpp"
-#include "openlpclient.hpp"
-
-class MainWindow: public QMainWindow {
-	Q_OBJECT
-
-   private:
-	   OBSClient m_obsClient;
-		OpenLPClient m_openlpClient;
-
-   public:
-		MainWindow(QWidget *parent = nullptr);
-		~MainWindow();
-
-   private slots:
-
-};

obs_scene_switcher.py

@@ -0,0 +1,41 @@
+from http.server import HTTPServer, BaseHTTPRequestHandler
+from urllib.parse import urlparse, parse_qs
+import threading
+import obspython as obs
+
+
+def set_current_scene(scene_name):
+    scenes = obs.obs_frontend_get_scenes()
+    for scene in scenes:
+        name = obs.obs_source_get_name(scene)
+        if name == scene_name:
+            obs.obs_frontend_set_current_scene(scene)
+            return 0
+    return 1
+
+
+class RqstHandler(BaseHTTPRequestHandler):
+
+    def do_GET(self):
+        up = urlparse(self.path)
+        if up.path == '/Scene':
+            qc = parse_qs(up.query)
+            set_current_scene(qc.get('name', [''])[0])
+            self.send_response(200)
+            self.end_headers()
+        elif up.path == '/ping':
+            self.send_response(200)
+            self.end_headers()
+
+
+    def log_message(self, format, *args):
+        pass
+
+
+def run(name):
+    httpd = HTTPServer(('127.0.0.1', 9302), RqstHandler)
+    httpd.serve_forever()
+
+
+t = threading.Thread(target=run, args=(1,), daemon=True)
+t.start()

obsclient.cpp

@@ -1,30 +0,0 @@
-#include "obsclient.hpp"
-
-OBSClient::OBSClient(QObject *parent): QObject(parent) {
-}
-
-void OBSClient::setScene(QString scene) {
-	get(QString("/Scene?name=%1").arg(scene));
-}
-
-void OBSClient::showSlides() {
-	setScene("MusicScene");
-}
-
-void OBSClient::hideSlides() {
-	setScene("SpeakerScene");
-}
-
-void OBSClient::setSlidesVisible(int state) {
-	if (state) {
-		setScene("MusicScene");
-	} else {
-		setScene("SpeakerScene");
-	}
-}
-
-void OBSClient::get(QString urlExt) {
-	QUrl url(QString(BaseUrl) + urlExt);
-	QNetworkRequest rqst(url);
-	m_nam->get(rqst);
-}

obsclient.hpp

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <QNetworkAccessManager>
-#include <QObject>
-
-class OBSClient : public QObject
-{
-	Q_OBJECT
-   private:
-	   static constexpr auto BaseUrl = "http://127.0.0.1:9302";
-		QNetworkAccessManager *m_nam = new QNetworkAccessManager(this);
-
-   public:
-		explicit OBSClient(QObject *parent = nullptr);
-
-   public slots:
-		void setScene(QString scene);
-
-		void showSlides();
-
-		void hideSlides();
-
-		void setSlidesVisible(int state);
-
-   private:
-		void get(QString url);
-
-};
-

slideview.hpp

@@ -1,31 +0,0 @@
-#pragma once
-
-#include <QWidget>
-
-class SlideView : public QWidget
-{
-	Q_OBJECT
-   private:
-	   class QTableWidget *m_slideTable = nullptr;
-		class QComboBox *m_songSelector = nullptr;
-		QString m_currentSong;
-		int m_currentSlide = -1;
-   public:
-		explicit SlideView(QWidget *parent = nullptr);
-
-   public slots:
-		void pollUpdate(QString songId, int slideNum);
-
-		void songListUpdate(QStringList songList);
-
-		void slideListUpdate(QStringList tagList, QStringList songList);
-
-   private slots:
-		void changeSong(int song);
-
-   signals:
-		void songChanged(int);
-
-		void slideChanged(int);
-};
-

src/CMakeLists.txt

@@ -0,0 +1,31 @@
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package(QT NAMES Qt6 Qt5 COMPONENTS Network Widgets REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Network Widgets REQUIRED)
+
+add_executable(
+	SlideController MACOSX_BUNDLE WIN32
+		main.cpp
+		mainwindow.cpp
+		obsclient.cpp
+		openlpclient.cpp
+		slideview.cpp
+)
+
+target_link_libraries(
+	SlideController
+		Qt${QT_VERSION_MAJOR}::Network
+		Qt${QT_VERSION_MAJOR}::Widgets
+)
+
+install(
+	TARGETS
+		SlideController
+	DESTINATION
+		bin
+	BUNDLE DESTINATION .
+)
+

src/consts.hpp

@@ -0,0 +1,11 @@
+/*
+ * Copyright 2021 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+constexpr auto SlideHost = "127.0.0.1";

src/main.cpp

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <QApplication>
+
+#include "mainwindow.hpp"
+
+int main(int argc, char *argv[]) {
+	QApplication a(argc, argv);
+	QApplication::setApplicationName(QObject::tr("Slide Controller 9000"));
+	MainWindow w;
+	w.show();
+	return QApplication::exec();
+}

src/mainwindow.cpp

@@ -0,0 +1,112 @@
+/*
+ * Copyright 2021 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QStatusBar>
+
+#include "slideview.hpp"
+#include "mainwindow.hpp"
+
+MainWindow::MainWindow(QWidget *parent): QMainWindow(parent) {
+	move(0, 0);
+	setFixedSize(590, 555);
+	setWindowTitle(tr("Slide Controller 9000"));
+	const auto mainWidget = new QWidget(this);
+	const auto rootLyt = new QVBoxLayout;
+	const auto controlsLayout = new QGridLayout;
+	m_slideView = new SlideView(this);
+	setCentralWidget(mainWidget);
+	mainWidget->setLayout(rootLyt);
+	rootLyt->addWidget(m_slideView);
+	rootLyt->addLayout(controlsLayout);
+	// setup slide controls
+	const auto showHideLyt = new QHBoxLayout;
+	rootLyt->addLayout(showHideLyt);
+	const auto btnPrevSong = new QPushButton(tr("Previous Song (Left)"), this);
+	const auto btnPrevSlide = new QPushButton(tr("Previous Slide (Up)"), this);
+	const auto btnNextSlide = new QPushButton(tr("Next Slide (Down)"), this);
+	const auto btnNextSong = new QPushButton(tr("Next Song (Right)"), this);
+	const auto btnHideSlides = new QPushButton(tr("Hide (1)"), this);
+	const auto btnOpenLpShowSlides = new QPushButton(tr("Show in OpenLP Only (2)"), this);
+	const auto btnShowSlides = new QPushButton(tr("Show (3)"), mainWidget);
+	controlsLayout->addWidget(btnPrevSlide, 0, 1);
+	controlsLayout->addWidget(btnNextSlide, 0, 2);
+	controlsLayout->addWidget(btnPrevSong, 0, 0);
+	controlsLayout->addWidget(btnNextSong, 0, 3);
+	showHideLyt->addWidget(btnHideSlides);
+	showHideLyt->addWidget(btnOpenLpShowSlides);
+	showHideLyt->addWidget(btnShowSlides);
+	btnNextSong->setShortcut(Qt::Key_Right);
+	btnPrevSong->setShortcut(Qt::Key_Left);
+	btnNextSlide->setShortcut(Qt::Key_Down);
+	btnPrevSlide->setShortcut(Qt::Key_Up);
+	btnHideSlides->setShortcut(Qt::Key_1);
+	btnOpenLpShowSlides->setShortcut(Qt::Key_2);
+	btnHideSlides->setToolTip(tr("Also hides slides in OBS"));
+	btnShowSlides->setShortcut(Qt::Key_3);
+	connect(btnNextSlide, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::nextSlide);
+	connect(btnPrevSlide, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::prevSlide);
+	connect(btnNextSong, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::nextSong);
+	connect(btnPrevSong, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::prevSong);
+	connect(btnHideSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::blankScreen);
+	connect(btnHideSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);
+	connect(btnOpenLpShowSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::showSlides);
+	connect(btnShowSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::showSlides);
+	connect(btnShowSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::showSlides);
+	connect(&m_openlpClient, &OpenLPClient::pollUpdate, m_slideView, &SlideView::pollUpdate);
+	connect(&m_openlpClient, &OpenLPClient::songListUpdate, m_slideView, &SlideView::songListUpdate);
+	connect(&m_openlpClient, &OpenLPClient::slideListUpdate, m_slideView, &SlideView::slideListUpdate);
+	connect(&m_openlpClient, &OpenLPClient::pollFailed, m_slideView, &SlideView::reset);
+	connect(m_slideView, &SlideView::songChanged, &m_openlpClient, &OpenLPClient::changeSong);
+	connect(m_slideView, &SlideView::slideChanged, &m_openlpClient, &OpenLPClient::changeSlide);
+	// setup scene selector
+	connect(btnOpenLpShowSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);
+	// setup status bar
+	setStatusBar(new QStatusBar(this));
+	connect(&m_openlpClient, &OpenLPClient::songChanged, this, &MainWindow::refreshStatusBar);
+	connect(&m_openlpClient, &OpenLPClient::pollUpdate, this, &MainWindow::openLpConnectionInit);
+	connect(&m_obsClient, &OBSClient::pollUpdate, this, &MainWindow::obsConnectionInit);
+	refreshStatusBar();
+}
+
+void MainWindow::openLpConnectionInit() {
+	disconnect(&m_openlpClient, &OpenLPClient::pollUpdate, this, &MainWindow::openLpConnectionInit);
+	connect(&m_openlpClient, &OpenLPClient::pollFailed, this, &MainWindow::openLpConnectionLost);
+	m_openLpConnected = true;
+	refreshStatusBar();
+}
+
+void MainWindow::openLpConnectionLost() {
+	disconnect(&m_openlpClient, &OpenLPClient::pollFailed, this, &MainWindow::openLpConnectionLost);
+	connect(&m_openlpClient, &OpenLPClient::pollUpdate, this, &MainWindow::openLpConnectionInit);
+	m_openLpConnected = false;
+	refreshStatusBar();
+}
+
+void MainWindow::obsConnectionInit() {
+	disconnect(&m_obsClient, &OBSClient::pollUpdate, this, &MainWindow::obsConnectionInit);
+	connect(&m_obsClient, &OBSClient::pollFailed, this, &MainWindow::obsConnectionLost);
+	m_obsConnected = true;
+	refreshStatusBar();
+}
+
+void MainWindow::obsConnectionLost() {
+	disconnect(&m_obsClient, &OBSClient::pollFailed, this, &MainWindow::obsConnectionLost);
+	connect(&m_obsClient, &OBSClient::pollUpdate, this, &MainWindow::obsConnectionInit);
+	m_obsConnected = false;
+	refreshStatusBar();
+}
+
+void MainWindow::refreshStatusBar() {
+	const auto openLpStatus = m_openLpConnected ? tr("OpenLP: Connected") : tr("OpenLP: Not Connected");
+	const auto obsStatus = m_obsConnected ? tr("OBS: Connected") : tr("OBS: Not Connected");
+	const auto nextSong = m_openlpClient.getNextSong();
+	const auto nextSongTxt = m_openLpConnected ? " | Next Song: " + nextSong : "";
+	statusBar()->showMessage(openLpStatus + " | " + obsStatus + nextSongTxt);
+}

src/mainwindow.hpp

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2021 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <cstdint>
+
+#include <QMainWindow>
+
+#include "obsclient.hpp"
+#include "openlpclient.hpp"
+
+class MainWindow: public QMainWindow {
+	Q_OBJECT
+
+	private:
+		OBSClient m_obsClient;
+		OpenLPClient m_openlpClient;
+		class SlideView *m_slideView = nullptr;
+		bool m_openLpConnected = false;
+		bool m_obsConnected = false;
+
+	public:
+		explicit MainWindow(QWidget *parent = nullptr);
+		~MainWindow() override = default;
+
+	private slots:
+		void openLpConnectionInit();
+
+		void openLpConnectionLost();
+
+		void obsConnectionInit();
+
+		void obsConnectionLost();
+
+		void refreshStatusBar();
+
+};

src/obsclient.cpp

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2021 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QUrl>
+
+#include "obsclient.hpp"
+
+OBSClient::OBSClient(QObject *parent): QObject(parent) {
+	m_pollTimer.start(1000);
+	connect(&m_pollTimer, &QTimer::timeout, this, &OBSClient::poll);
+	connect(m_pollingNam, &QNetworkAccessManager::finished, this, &OBSClient::handlePollResponse);
+}
+
+void OBSClient::setScene(QString scene) {
+	get(QString("/Scene?name=%1").arg(scene));
+}
+
+void OBSClient::showSlides() {
+	setScene("MusicScene");
+}
+
+void OBSClient::hideSlides() {
+	setScene("SpeakerScene");
+}
+
+void OBSClient::setSlidesVisible(int state) {
+	if (state) {
+		setScene("MusicScene");
+	} else {
+		setScene("SpeakerScene");
+	}
+}
+
+void OBSClient::get(QString urlExt) {
+	QUrl url(QString(BaseUrl) + urlExt);
+	QNetworkRequest rqst(url);
+	auto reply = m_nam->get(rqst);
+	connect(reply, &QIODevice::readyRead, reply, &QObject::deleteLater);
+}
+
+void OBSClient::poll() {
+	QUrl url(QString(BaseUrl) + "/ping");
+	QNetworkRequest rqst(url);
+	m_pollingNam->get(rqst);
+}
+
+void OBSClient::handlePollResponse(QNetworkReply *reply) {
+	reply->deleteLater();
+	if (reply->error()) {
+		qDebug() << "OBSClient error response:" << reply->errorString();
+		emit pollFailed();
+		return;
+	}
+	emit pollUpdate();
+}
+

src/obsclient.hpp

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <QNetworkAccessManager>
+#include <QObject>
+#include <QTimer>
+
+#include "consts.hpp"
+
+class OBSClient: public QObject {
+	Q_OBJECT
+	private:
+		const QString BaseUrl = QString("http://") + SlideHost + ":9302";
+		QNetworkAccessManager *m_nam = new QNetworkAccessManager(this);
+		QNetworkAccessManager *m_pollingNam = new QNetworkAccessManager(this);
+		QTimer m_pollTimer;
+
+	public:
+		explicit OBSClient(QObject *parent = nullptr);
+
+	public slots:
+		void setScene(QString scene);
+
+		void showSlides();
+
+		void hideSlides();
+
+		void setSlidesVisible(int state);
+
+	private:
+		void get(QString url);
+
+		void poll();
+
+		void handlePollResponse(QNetworkReply *reply);
+
+	signals:
+		void pollUpdate();
+
+		void pollFailed();
+
+};
+

src/openlpclient.cpp

@@ -1,5 +1,13 @@
-#include <QJsonDocument>
+/*
+ * Copyright 2021 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
 #include <QJsonArray>
+#include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValueRef>
 #include <QNetworkReply>
@@ -8,7 +16,7 @@
 
 OpenLPClient::OpenLPClient(QObject *parent): QObject(parent) {
 	poll();
-	m_pollTimer.start(500);
+	m_pollTimer.start(250);
 	connect(&m_pollTimer, &QTimer::timeout, this, &OpenLPClient::poll);
 	connect(m_nam, &QNetworkAccessManager::finished, this, &OpenLPClient::handleGeneralResponse);
 	connect(m_songListNam, &QNetworkAccessManager::finished, this, &OpenLPClient::handleSongListResponse);
@@ -16,6 +24,15 @@ OpenLPClient::OpenLPClient(QObject *parent): QObject(parent) {
 	connect(m_pollingNam, &QNetworkAccessManager::finished, this, &OpenLPClient::handlePollResponse);
 }
 
+QString OpenLPClient::getNextSong() {
+	const auto currentSong = m_songNameMap[m_currentSongId];
+	const auto songIdx = m_songList.indexOf(currentSong) + 1;
+	if (songIdx < m_songList.size()) {
+		return m_songList[songIdx];
+	}
+	return "";
+}
+
 void OpenLPClient::nextSlide() {
 	get("/api/controller/live/next");
 }
@@ -77,14 +94,21 @@ void OpenLPClient::poll() {
 }
 
 void OpenLPClient::handleGeneralResponse(QNetworkReply *reply) {
+	reply->deleteLater();
 	if (reply->error()) {
-		qDebug() << reply->request().url() << ":" << reply->errorString();
+		qDebug() << "OpenLPClient error response:" << reply->request().url() << ":" << reply->errorString();
 	}
 }
 
 void OpenLPClient::handlePollResponse(QNetworkReply *reply) {
+	reply->deleteLater();
 	if (reply->error()) {
-		qDebug() << reply->errorString();
+		qDebug() << "OpenLPClient error response:" << reply->errorString();
+		emit pollFailed();
+		m_currentServiceId = -1;
+		m_currentSongId = "";
+		m_songNameMap.clear();
+		return;
 	}
 	auto data = reply->readAll();
 	if (data.isEmpty()) {
@@ -102,37 +126,38 @@ void OpenLPClient::handlePollResponse(QNetworkReply *reply) {
 	if (m_currentSongId != songId) {
 		requestSlideList();
 		m_currentSongId = songId;
+		emit songChanged(songId);
 	}
 	emit pollUpdate(m_songNameMap[songId], slide);
 }
 
 void OpenLPClient::handleSongListResponse(QNetworkReply *reply) {
+	reply->deleteLater();
 	if (reply->error()) {
-		qDebug() << reply->errorString();
+		qDebug() << "OpenLPClient error response:" << reply->errorString();
 	}
 	auto data = reply->readAll();
 	if (data.isEmpty()) {
 		return;
 	}
-	QStringList songList;
 	auto doc = QJsonDocument::fromJson(data);
 	auto items = doc.object()["results"].toObject()["items"].toArray();
-	m_songIdMap.clear();
 	m_songNameMap.clear();
+	m_songList.clear();
 	for (const auto &item : items) {
 		auto song = item.toObject();
 		auto name = song["title"].toString();
 		auto id = song["id"].toString();
-		m_songIdMap[name] = id;
 		m_songNameMap[id] = name;
-		songList.push_back(name);
+		m_songList.push_back(name);
 	}
-	emit songListUpdate(songList);
+	emit songListUpdate(m_songList);
 }
 
 void OpenLPClient::handleSlideListResponse(QNetworkReply *reply) {
+	reply->deleteLater();
 	if (reply->error()) {
-		qDebug() << reply->errorString();
+		qDebug() << "OpenLPClient error response:" << reply->errorString();
 	}
 	auto data = reply->readAll();
 	if (data.isEmpty()) {

src/openlpclient.hpp

@@ -1,3 +1,11 @@
+/*
+ * Copyright 2021 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
 #pragma once
 
 #include <QHash>
@@ -5,27 +13,33 @@
 #include <QObject>
 #include <QTimer>
 
+#include "consts.hpp"
+
 class OpenLPClient: public QObject {
 	Q_OBJECT
-   private:
-	   struct Song {
+
+	private:
+		struct Song {
 			QString name;
 			QString id;
 		};
-	   static constexpr auto BaseUrl = "http://127.0.0.1:4316";
+		const QString BaseUrl = QString("http://") + SlideHost + ":4316";
 		QNetworkAccessManager *m_nam = new QNetworkAccessManager(this);
 		QNetworkAccessManager *m_pollingNam = new QNetworkAccessManager(this);
 		QNetworkAccessManager *m_songListNam = new QNetworkAccessManager(this);
 		QNetworkAccessManager *m_slideListNam = new QNetworkAccessManager(this);
 		QTimer m_pollTimer;
-		QHash<QString, QString> m_songIdMap;
 		QHash<QString, QString> m_songNameMap;
+		QStringList m_songList;
 		int m_currentServiceId = -1;
 		QString m_currentSongId;
 
-   public:
+	public:
 		explicit OpenLPClient(QObject *parent = nullptr);
 
+		[[nodiscard]]
+		QString getNextSong();
+
    public slots:
 		void nextSlide();
 
@@ -43,14 +57,14 @@ class OpenLPClient: public QObject {
 
 		void changeSlide(int slide);
 
-   private:
+	private:
 		void get(QString url);
 
 		void requestSongList();
 
 		void requestSlideList();
 
-   private slots:
+	private slots:
 		void poll();
 
 		void handleGeneralResponse(QNetworkReply *reply);
@@ -61,12 +75,15 @@ class OpenLPClient: public QObject {
 
 		void handleSlideListResponse(QNetworkReply *reply);
 
-   signals:
+	signals:
 		void pollUpdate(QString songId, int slideNum);
 
+		void pollFailed();
+
 		void songListUpdate(QStringList);
 
 		void slideListUpdate(QStringList, QStringList);
 
+		void songChanged(QString);
 };
 

src/slideview.cpp

@@ -1,14 +1,23 @@
+/*
+ * Copyright 2021 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
 #include <QComboBox>
 #include <QDebug>
+#include <QHBoxLayout>
 #include <QHeaderView>
+#include <QListWidget>
 #include <QTableWidget>
-#include <QVBoxLayout>
 
 #include "slideview.hpp"
 
 SlideView::SlideView(QWidget *parent): QWidget(parent) {
-	auto lyt = new QVBoxLayout(this);
-	m_songSelector = new QComboBox(this);
+	auto lyt = new QHBoxLayout(this);
+	m_songSelector = new QListWidget(this);
 	m_slideTable = new QTableWidget(this);
 	auto header = m_slideTable->horizontalHeader();
 	header->setVisible(false);
@@ -16,18 +25,33 @@ SlideView::SlideView(QWidget *parent): QWidget(parent) {
 	m_slideTable->setSelectionBehavior(QTableWidget::SelectionBehavior::SelectRows);
 	m_slideTable->setSelectionMode(QTableWidget::SelectionMode::SingleSelection);
 	m_slideTable->setColumnCount(1);
-	connect(header, &QHeaderView::sectionResized, m_slideTable, &QTableWidget::resizeRowsToContents);
-	m_slideTable->resizeRowsToContents();
 	m_slideTable->verticalHeader()->setDefaultSectionSize(300);
-	lyt->addWidget(m_songSelector);
+#ifndef _WIN32
+	m_slideTable->setAlternatingRowColors(true);
+#endif
 	lyt->addWidget(m_slideTable);
+	lyt->addWidget(m_songSelector);
 	connect(m_slideTable, &QTableWidget::currentCellChanged, this, &SlideView::slideChanged);
 }
 
+QString SlideView::getNextSong() const {
+	const auto cnt = m_songSelector->count();
+	const auto idx = m_songSelector->currentRow() + 1;
+	if (idx < cnt) {
+		return m_songSelector->currentItem()->text();
+	}
+	return "";
+}
+
 void SlideView::pollUpdate(QString songName, int slide) {
-	if (songName != m_currentSong) {
+	auto songItems = m_songSelector->findItems(songName, Qt::MatchFixedString);
+	if (songItems.size() < 1) {
+		return;
+	}
+	auto songItem = songItems.first();
+	if (songItem != m_songSelector->currentItem()) {
 		m_currentSong = songName;
-		m_songSelector->setCurrentText(songName);
+		m_songSelector->setCurrentItem(songItem);
 	}
 	if (slide != m_currentSlide) {
 		m_currentSlide = slide;
@@ -36,7 +60,8 @@ void SlideView::pollUpdate(QString songName, int slide) {
 }
 
 void SlideView::changeSong(int song) {
-	if (m_songSelector->currentText() != m_currentSong) {
+	auto songItem = m_songSelector->item(song);
+	if (songItem->text() != m_currentSong) {
 		emit songChanged(song);
 	}
 }
@@ -51,6 +76,14 @@ void SlideView::slideListUpdate(QStringList tagList, QStringList slideList) {
 		m_slideTable->setItem(i, 0, item);
 	}
 	m_slideTable->setVerticalHeaderLabels(tagList);
+	m_slideTable->resizeRowsToContents();
+}
+
+void SlideView::reset() {
+	m_songSelector->clear();
+	m_slideTable->setRowCount(0);
+	m_currentSong = "";
+	m_currentSlide = -1;
 }
 
 void SlideView::songListUpdate(QStringList songList) {
@@ -64,5 +97,5 @@ void SlideView::songListUpdate(QStringList songList) {
 	if (isReplacement) {
 		changeSong(0);
 	}
-	connect(m_songSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(changeSong(int)));
+	connect(m_songSelector, &QListWidget::currentRowChanged, this, &SlideView::changeSong);
 }

src/slideview.hpp

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2021 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#pragma once
+
+#include <QWidget>
+
+class SlideView: public QWidget {
+	Q_OBJECT
+	private:
+		class QTableWidget *m_slideTable = nullptr;
+		class QListWidget *m_songSelector = nullptr;
+		QString m_currentSong;
+		int m_currentSlide = -1;
+
+	public:
+		explicit SlideView(QWidget *parent = nullptr);
+
+		[[nodiscard]]
+		QString getNextSong() const;
+
+	public slots:
+		void pollUpdate(QString songId, int slideNum);
+
+		void songListUpdate(QStringList songList);
+
+		void slideListUpdate(QStringList tagList, QStringList songList);
+
+		void reset();
+
+	private slots:
+		void changeSong(int song);
+
+	signals:
+		void songChanged(int);
+
+		void slideChanged(int);
+};
+