Skip to content

Refactor of the TBC library debugging, metadata bug fix and minor documentation change #981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simoninns merged 6 commits into from
Dec 7, 2025
Merged

Refactor of the TBC library debugging, metadata bug fix and minor documentation change #981

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e08a916
Fixes to readme.md
simoninns Dec 7, 2025
3d583db
Re-enable the --debug switch for all Qt tools
simoninns Dec 7, 2025
9bcd6c1
Fixed a bug in SQLite metadata writeField that was failing to update …
simoninns Dec 7, 2025
b6be6a0
Move away from qDebug for application-specific debug information so y…
simoninns Dec 7, 2025
aaf5bf8
Refactor all tools to use new application specific debug in TBC library
simoninns Dec 7, 2025
1e4e786
Harmonize the way the TBC library is used across the tools with a ref…
simoninns Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor all tools to use new application specific debug in TBC library
  • Loading branch information
@simoninns
simoninns committed Dec 7, 2025
commit aaf5bf8138c08b78ea53e6b4b44c8f8a482e5d5b
Empty file added tlist.tmp
View file
Open in desktop
Empty file.
7 changes: 5 additions & 2 deletions tools/efm-decoder/libs/efm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@ set(TARGET_NAME efm)

# Source files
file(GLOB SOURCES "src/*.cpp")
# Drop legacy logging.cpp; use shared TBC logging instead
list(FILTER SOURCES EXCLUDE REGEX ".*/logging\\.cpp$")

# Create the static library
add_library(${TARGET_NAME} STATIC ${SOURCES})

# Add the include directories
target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/tools/library)

# Add the include directory for the ezpwd library
target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/ezpwd/c++)

# Link Qt libraries
target_link_libraries(${TARGET_NAME} Qt::Core)
# Link Qt and shared lddecode-library (for TBC logging)
target_link_libraries(${TARGET_NAME} PUBLIC Qt::Core lddecode-library)

# Optionally, you can specify the output directory for the library
set_target_properties(${TARGET_NAME} PROPERTIES
Expand Down
50 changes: 0 additions & 50 deletions tools/efm-decoder/libs/efm/include/logging.h
View file
Open in desktop

This file was deleted.

19 changes: 10 additions & 9 deletions tools/efm-decoder/libs/efm/src/audio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
************************************************************************/

#include "audio.h"
#include "tbc/logging.h"

// Audio class
// Set the data for the audio, ensuring it matches the frame size
Expand Down Expand Up @@ -54,7 +55,7 @@ void Audio::setDataLeftRight(const QVector<qint16> &dataLeft, const QVector<qint
QVector<qint16> Audio::data() const
{
if (m_audioData.isEmpty()) {
qDebug() << "Audio::data(): Frame is empty, returning zero-filled vector";
tbcDebugStream() << "Audio::data(): Frame is empty, returning zero-filled vector";
return QVector<qint16>(frameSize(), 0);
}
return m_audioData;
Expand All @@ -64,7 +65,7 @@ QVector<qint16> Audio::data() const
QVector<qint16> Audio::dataLeft() const
{
if (m_audioData.isEmpty()) {
qDebug() << "Audio::dataLeft(): Frame is empty, returning zero-filled vector";
tbcDebugStream() << "Audio::dataLeft(): Frame is empty, returning zero-filled vector";
return QVector<qint16>(frameSize(), 0);
}

Expand All @@ -79,7 +80,7 @@ QVector<qint16> Audio::dataLeft() const
QVector<qint16> Audio::dataRight() const
{
if (m_audioData.isEmpty()) {
qDebug() << "Audio::dataRight(): Frame is empty, returning zero-filled vector";
tbcDebugStream() << "Audio::dataRight(): Frame is empty, returning zero-filled vector";
return QVector<qint16>(frameSize(), 0);
}

Expand Down Expand Up @@ -119,7 +120,7 @@ void Audio::setErrorDataLeftRight(const QVector<bool> &errorDataLeft, const QVec
QVector<bool> Audio::errorData() const
{
if (m_audioErrorData.isEmpty()) {
qDebug() << "Audio::errorData(): Error frame is empty, returning zero-filled vector";
tbcDebugStream() << "Audio::errorData(): Error frame is empty, returning zero-filled vector";
return QVector<bool>(frameSize(), false);
}
return m_audioErrorData;
Expand All @@ -129,7 +130,7 @@ QVector<bool> Audio::errorData() const
QVector<bool> Audio::errorDataLeft() const
{
if (m_audioErrorData.isEmpty()) {
qDebug() << "Audio::errorDataLeft(): Error frame is empty, returning zero-filled vector";
tbcDebugStream() << "Audio::errorDataLeft(): Error frame is empty, returning zero-filled vector";
return QVector<bool>(frameSize(), false);
}

Expand All @@ -144,7 +145,7 @@ QVector<bool> Audio::errorDataLeft() const
QVector<bool> Audio::errorDataRight() const
{
if (m_audioErrorData.isEmpty()) {
qDebug() << "Audio::errorDataRight(): Error frame is empty, returning zero-filled vector";
tbcDebugStream() << "Audio::errorDataRight(): Error frame is empty, returning zero-filled vector";
return QVector<bool>(frameSize(), false);
}

Expand Down Expand Up @@ -217,7 +218,7 @@ void Audio::showData()
}
}

qDebug().noquote() << dataString.trimmed().toUpper();
tbcDebugStream().noquote() << dataString.trimmed().toUpper();
}

int Audio::frameSize() const
Expand All @@ -237,8 +238,8 @@ void Audio::setConcealedData(const QVector<bool> &concealedData)
QVector<bool> Audio::concealedData() const
{
if (m_audioConcealedData.isEmpty()) {
qDebug() << "Audio::concealedData(): Concealed data is empty, returning zero-filled vector";
tbcDebugStream() << "Audio::concealedData(): Concealed data is empty, returning zero-filled vector";
return QVector<bool>(frameSize(), false);
}
return m_audioConcealedData;
}
}
7 changes: 4 additions & 3 deletions tools/efm-decoder/libs/efm/src/frame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
************************************************************************/

#include "frame.h"
#include "tbc/logging.h"

// Frame class
// --------------------------------------------------------------------------------------------------------
Expand All @@ -41,7 +42,7 @@ void Frame::setData(const QVector<quint8> &data)
QVector<quint8> Frame::data() const
{
if (m_frameData.isEmpty()) {
qDebug() << "Frame::getData(): Frame is empty, returning zero-filled vector";
tbcDebugStream() << "Frame::getData(): Frame is empty, returning zero-filled vector";
return QVector<quint8>(frameSize(), 0);
}
return m_frameData;
Expand All @@ -64,7 +65,7 @@ void Frame::setErrorData(const QVector<bool> &errorData)
QVector<bool> Frame::errorData() const
{
if (m_frameErrorData.isEmpty()) {
qDebug() << "Frame::getErrorData(): Error frame is empty, returning zero-filled vector";
tbcDebugStream() << "Frame::getErrorData(): Error frame is empty, returning zero-filled vector";
return QVector<bool>(frameSize(), 0);
}
return m_frameErrorData;
Expand Down Expand Up @@ -99,7 +100,7 @@ void Frame::setPaddedData(const QVector<bool> &paddedData)
QVector<bool> Frame::paddedData() const
{
if (m_framePaddedData.isEmpty()) {
qDebug() << "Frame::paddedData(): Padded data is empty, returning zero-filled vector";
tbcDebugStream() << "Frame::paddedData(): Padded data is empty, returning zero-filled vector";
return QVector<bool>(frameSize(), 0);
}
return m_framePaddedData;
Expand Down
174 changes: 0 additions & 174 deletions tools/efm-decoder/libs/efm/src/logging.cpp
View file
Open in desktop

This file was deleted.

Loading