dguglielmi/sunny-overlay
1
0
Fork 0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 13:52:40 +01:00
Code Issues Releases Wiki Activity

- media-sound/mixxx: fix segfault when USE=-shoutcast

Browse Source
This commit is contained in:
David GUGLIELMI
2015-12-12 14:40:26 +01:00
parent 9528deab12
commit 88433aaa0f
3 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
media-sound/mixxx/files/mixxx-2.0.0_rc1-prevent-null-networkstreamworker.patch Normal file
View File

@@ -0,0 +1,54 @@
From 6aeea5f8ec42c6d99cd5610d24673978c5e80a28 Mon Sep 17 00:00:00 2001
From: RJ Ryan <rryan@mixxx.org>
Date: Sat, 5 Dec 2015 17:32:06 -0800
Subject: [PATCH] Add protection against null NetworkStreamWorker in
EngineNetworkStream. Fixes segfault on startup when built with broadcasting
disabled.
---
src/engine/sidechain/enginenetworkstream.cpp | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/engine/sidechain/enginenetworkstream.cpp b/src/engine/sidechain/enginenetworkstream.cpp
index 1b5b11e..88734b4 100644
--- a/src/engine/sidechain/enginenetworkstream.cpp
+++ b/src/engine/sidechain/enginenetworkstream.cpp
@@ -92,6 +92,9 @@ int EngineNetworkStream::getReadExpected() {
}
void EngineNetworkStream::write(const CSAMPLE* buffer, int frames) {
+ if (m_pWorker.isNull()) {
+ return;
+ }
//qDebug() << "EngineNetworkStream::write()" << frames;
if (!m_pWorker->threadWaiting()) {
@@ -119,6 +122,9 @@ void EngineNetworkStream::write(const CSAMPLE* buffer, int frames) {
}
void EngineNetworkStream::writeSilence(int frames) {
+ if (m_pWorker.isNull()) {
+ return;
+ }
//qDebug() << "EngineNetworkStream::writeSilence()" << frames;
if (!m_pWorker->threadWaiting()) {
// no thread waiting, so we can advance the stream without
@@ -152,6 +158,9 @@ void EngineNetworkStream::writeSilence(int frames) {
}
void EngineNetworkStream::scheduleWorker() {
+ if (m_pWorker.isNull()) {
+ return;
+ }
if (m_pOutputFifo->readAvailable()
>= m_numOutputChannels * kNetworkLatencyFrames) {
m_pWorker->outputAvailable();
@@ -237,5 +246,7 @@ qint64 EngineNetworkStream::getNetworkTimeUs() {
void EngineNetworkStream::addWorker(QSharedPointer<NetworkStreamWorker> pWorker) {
m_pWorker = pWorker;
- m_pWorker->setOutputFifo(m_pOutputFifo);
+ if (m_pWorker) {
+ m_pWorker->setOutputFifo(m_pOutputFifo);
+ }
}