From 7a64d0975edcfa91d3a73c1279fab929b1287391 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Wed, 1 Oct 2014 23:25:03 +0200 Subject: [PATCH 1/6] AudioAlsa: fix FTBFS on non-Linux platforms The ESTRPIPE error code is only available on Linux (and not on BSD) and thus should only be used if defined. --- src/core/audio/AudioAlsa.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/audio/AudioAlsa.cpp b/src/core/audio/AudioAlsa.cpp index 4e2dd70d1..b893f8e1d 100644 --- a/src/core/audio/AudioAlsa.cpp +++ b/src/core/audio/AudioAlsa.cpp @@ -1,7 +1,7 @@ /* * audio_alsa.cpp - device-class which implements ALSA-PCM-output * - * Copyright (c) 2004-2009 Tobias Doerffel + * Copyright (c) 2004-2014 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -149,6 +149,7 @@ int AudioAlsa::handleError( int _err ) "failed: %s\n", snd_strerror( _err ) ); return ( 0 ); } +#ifdef ESTRPIPE else if( _err == -ESTRPIPE ) { while( ( _err = snd_pcm_resume( m_handle ) ) == -EAGAIN ) @@ -166,6 +167,7 @@ int AudioAlsa::handleError( int _err ) } return ( 0 ); } +#endif return _err; } From 1c591e2e54ac0cb9c49680b2e4b3214151c0fa04 Mon Sep 17 00:00:00 2001 From: Spekular Date: Thu, 2 Oct 2014 17:57:24 +0200 Subject: [PATCH 2/6] Error Message Fixes Can't recovery --> Can't recover --- src/core/audio/AudioAlsa.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/audio/AudioAlsa.cpp b/src/core/audio/AudioAlsa.cpp index b893f8e1d..208ad62b0 100644 --- a/src/core/audio/AudioAlsa.cpp +++ b/src/core/audio/AudioAlsa.cpp @@ -145,7 +145,7 @@ int AudioAlsa::handleError( int _err ) // under-run _err = snd_pcm_prepare( m_handle ); if( _err < 0 ) - printf( "Can't recovery from underrun, prepare " + printf( "Can't recover from underrun, prepare " "failed: %s\n", snd_strerror( _err ) ); return ( 0 ); } @@ -162,7 +162,7 @@ int AudioAlsa::handleError( int _err ) { _err = snd_pcm_prepare( m_handle ); if( _err < 0 ) - printf( "Can't recovery from suspend, prepare " + printf( "Can't recover from suspend, prepare " "failed: %s\n", snd_strerror( _err ) ); } return ( 0 ); From ace33aa39cc72703f63f5a9f7f7ca1a787ee69da Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Fri, 3 Oct 2014 14:42:37 -0400 Subject: [PATCH 3/6] Vestige Controls - Horiz Scrollbar Fix Adds a horizontal scrollbar to VSTs Controls with longer knob labels. Closes #1184 --- plugins/vestige/vestige.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp index 5723aafde..cdb0551d8 100644 --- a/plugins/vestige/vestige.cpp +++ b/plugins/vestige/vestige.cpp @@ -982,7 +982,6 @@ manageVestigeInstrumentView::manageVestigeInstrumentView( Instrument * _instrume widget->setAutoFillBackground(true); m_vi->m_scrollArea->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); - m_vi->m_scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); m_vi->m_scrollArea->setPalette( QApplication::palette( m_vi->m_scrollArea ) ); m_vi->m_scrollArea->setMinimumHeight( 64 ); From d317704b27911357e7eed5da1a9989effec2fe41 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sun, 5 Oct 2014 22:31:50 +0200 Subject: [PATCH 4/6] LmmsPalette: retrieve palette properties via polishing Fix the short palette widget popup which is annoying and not neccessary as polishing does the same job without flicker. --- src/core/main.cpp | 2 -- src/gui/LmmsPalette.cpp | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core/main.cpp b/src/core/main.cpp index 5cb923b55..7d66664e0 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -399,8 +399,6 @@ int main( int argc, char * * argv ) QApplication::setStyle( lmmsstyle ); LmmsPalette * lmmspal = new LmmsPalette( NULL, lmmsstyle ); - lmmspal->show(); // necessary to get properties - lmmspal->hide(); QPalette lpal = lmmspal->palette(); QApplication::setPalette( lpal ); diff --git a/src/gui/LmmsPalette.cpp b/src/gui/LmmsPalette.cpp index 02c26312e..955b0683e 100644 --- a/src/gui/LmmsPalette.cpp +++ b/src/gui/LmmsPalette.cpp @@ -49,6 +49,7 @@ LmmsPalette::LmmsPalette( QWidget * parent, QStyle * stylearg ) : { setStyle( stylearg ); stylearg->polish( this ); + ensurePolished(); } LmmsPalette::~LmmsPalette() From 23d0832923bdd7d255276ddbd81b2f0a211c54a6 Mon Sep 17 00:00:00 2001 From: unfa Date: Wed, 15 Oct 2014 17:35:23 +0200 Subject: [PATCH 5/6] Removed the deprecated "Linux Multimedia Studio" name Modified line 46 accorinf to https://github.com/LMMS/lmms/issues/1209 --- src/gui/dialogs/about_dialog.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/dialogs/about_dialog.ui b/src/gui/dialogs/about_dialog.ui index 39c1974b9..87653597a 100644 --- a/src/gui/dialogs/about_dialog.ui +++ b/src/gui/dialogs/about_dialog.ui @@ -43,7 +43,7 @@ font:12pt; font-weight:bold; - LMMS (Linux MultiMedia Studio) + LMMS From 37671b1427d5bbce8d5dee6947c467e1b55d8116 Mon Sep 17 00:00:00 2001 From: Vesa Date: Wed, 15 Oct 2014 20:28:40 +0300 Subject: [PATCH 6/6] Revert 2ca84c15a17faa71a300bfa4de2fdffadf9627aa --- plugins/audio_file_processor/audio_file_processor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp index d23377c8d..a05c46666 100644 --- a/plugins/audio_file_processor/audio_file_processor.cpp +++ b/plugins/audio_file_processor/audio_file_processor.cpp @@ -482,9 +482,9 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument, m_loopOffButton->setCheckable( TRUE ); m_loopOffButton->move( 190, 105 ); m_loopOffButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( - "loop_off_off" ) ); - m_loopOffButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "loop_off_on" ) ); + m_loopOffButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( + "loop_off_off" ) ); toolTip::add( m_loopOffButton, tr( "Disable loop" ) ); m_loopOffButton->setWhatsThis( tr( "This button disables looping. "