Merge branch 'stable-1.1'

plugins/audio_file_processor/audio_file_processor.cpp

@@ -483,9 +483,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. "

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 );
 

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 <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -145,10 +145,11 @@ 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 );
 	}
+#ifdef ESTRPIPE
 	else if( _err == -ESTRPIPE )
 	{
 		while( ( _err = snd_pcm_resume( m_handle ) ) == -EAGAIN )
@@ -161,11 +162,12 @@ 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 );
 	}
+#endif
 	return _err;
 }
 

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 );

src/gui/LmmsPalette.cpp

@@ -49,6 +49,7 @@ LmmsPalette::LmmsPalette( QWidget * parent, QStyle * stylearg ) :
 {
 	setStyle( stylearg );
 	stylearg->polish( this );
+	ensurePolished();
 }
 
 LmmsPalette::~LmmsPalette()

src/gui/dialogs/about_dialog.ui

@@ -43,7 +43,7 @@
           <string notr="true" >font:12pt; font-weight:bold;</string>
          </property>
          <property name="text" >
-          <string>LMMS (Linux MultiMedia Studio)</string>
+          <string>LMMS</string>
          </property>
         </widget>
        </item>