amd64 support, extra plugins support, some fixes

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@568 0778d3d1-df1d-0410-868b-ea421aaaa00d

src/core/automation_editor.cpp

@@ -111,7 +111,10 @@ automationEditor::automationEditor( void ) :
 	}
 
 	// add us to workspace
-	engine::getMainWindow()->workspace()->addWindow( this );
+	if( engine::getMainWindow()->workspace() )
+	{
+		engine::getMainWindow()->workspace()->addWindow( this );
+	}
 
 	// add time-line
 	m_timeLine = new timeLine( VALUES_WIDTH, 32, m_ppt,

src/core/main.cpp

@@ -86,10 +86,10 @@ int main( int argc, char * * argv )
 	QString extension = "wav";
 	QString file_to_load;
 
-	for( int i = 1; i < app.argc(); ++i )
+	for( int i = 1; i < argc; ++i )
 	{
-		if( QString( app.argv()[i] ) == "--version" ||
-					QString( app.argv()[i] ) == "-v" )
+		if( QString( argv[i] ) == "--version" ||
+						QString( argv[i] ) == "-v" )
 		{
 			printf( "\nLinux MultiMedia Studio %s\n\n"
 	"Copyright (c) 2004-2007 Tobias Doerffel and others.\n\n"
@@ -101,9 +101,8 @@ int main( int argc, char * * argv )
 								argv[0] );
 			return( 0 );
 		}
-		else if( app.argc() > i &&
-				( QString( app.argv()[i] ) == "--help" ||
-					QString( app.argv()[i] ) == "-h" ) )
+		else if( argc > i && ( QString( argv[i] ) == "--help" ||
+						QString( argv[i] ) == "-h" ) )
 		{
 			printf( "\nLinux MultiMedia Studio %s\n"
 	"Copyright (c) 2004-2007 Tobias Doerffel and others.\n\n"
@@ -117,38 +116,35 @@ int main( int argc, char * * argv )
 							PACKAGE_VERSION );
 			return( 0 );
 		}
-		else if( app.argc() > i &&
-				( QString( app.argv()[i] ) == "--render" ||
-					QString( app.argv()[i] ) == "-r" ) )
+		else if( argc > i && ( QString( argv[i] ) == "--render" ||
+						QString( argv[i] ) == "-r" ) )
 		{
-			file_to_load = QString( app.argv()[i+1] );
+			file_to_load = QString( argv[i + 1] );
 			file_to_render = baseName( file_to_load ) + ".";
 			++i;
 		}
-		else if( app.argc() > i &&
-			( QString( app.argv()[i] ) == "--output-format" ||
-					QString( app.argv()[i] ) == "-o" ) )
+		else if( argc > i &&
+				( QString( argv[i] ) == "--output-format" ||
+						QString( argv[i] ) == "-o" ) )
 		{
-			extension = QString( app.argv()[i+1] );
+			extension = QString( argv[i + 1] );
 			if( extension != "wav" && extension != "ogg" )
 			{
 				printf( "\nInvalid output format %s.\n\n"
-	"Try \"%s --help\" for more information.\n\n", app.argv()[i+1],
-								argv[0] );
+	"Try \"%s --help\" for more information.\n\n", argv[i + 1], argv[0] );
 				return( -1 );
 			}
 			++i;
 		}
 		else
 		{
-			if( app.argv()[i][0] == '-' )
+			if( argv[i][0] == '-' )
 			{
 				printf( "\nInvalid option %s.\n\n"
-	"Try \"%s --help\" for more information.\n\n", app.argv()[i],
-								argv[0] );
+	"Try \"%s --help\" for more information.\n\n", argv[i], argv[0] );
 				return( -1 );
 			}
-			file_to_load = app.argv()[i];
+			file_to_load = argv[i];
 		}
 	}
 

src/core/main_window.cpp

@@ -25,7 +25,11 @@
  */
 
 
+#include "main_window.h"
+
+
 #include <QtGui/QApplication>
+#include <QtGui/QDesktopServices>
 #include <QtGui/QFileDialog>
 #include <QtGui/QCloseEvent>
 #include <QtGui/QSplitter>
@@ -40,7 +44,6 @@
 #endif
 
 
-#include "main_window.h"
 #include "bb_editor.h"
 #include "song_editor.h"
 #include "piano_roll.h"
@@ -142,8 +145,11 @@ mainWindow::mainWindow( void ) :
 		m_workspace->setScrollBarsEnabled( TRUE );
 
 #warning TODO
-/*		m_workspace->setBackground( embed::getIconPixmap(
-						"background_artwork" ) );*/
+		m_workspace->setAutoFillBackground( TRUE );
+		QPalette pal;
+		pal.setBrush( m_workspace->backgroundRole(),
+				embed::getIconPixmap( "background_artwork" ) );
+		m_workspace->setPalette( pal );
 	}
 
 	hbox->addWidget( side_bar );
@@ -445,7 +451,8 @@ void mainWindow::finalize( void )
 	// help-popup-menu
 	QMenu * help_menu = new QMenu( this );
 	menuBar()->addMenu( help_menu )->setText( tr( "&Help" ) );
-	if( have_www_browser() )
+	// May use offline help
+	if( TRUE )
 	{
 		help_menu->addAction( embed::getIconPixmap( "help" ),
 						tr( "Online help" ),
@@ -723,7 +730,7 @@ void mainWindow::help( void )
 				  tr( "Currently there's no help "
 						  "available in LMMS.\n"
 						  "Please visit "
-						  "http://wiki.mindrules.net "
+						  "http://lmms.sf.net/wiki "
 						  "for documentation on LMMS." ),
 				  QMessageBox::Ok );
 }
@@ -941,32 +948,12 @@ void mainWindow::showTool( QAction * _idx )
 
 
 
-
-bool mainWindow::have_www_browser( void )
-{
-	int ret = system( "which x-www-browser > /dev/null" );
-	return( WIFEXITED( ret ) && WEXITSTATUS( ret ) == EXIT_SUCCESS );
-}
-
-
-
-
 void mainWindow::browseHelp( void )
 {
-	pid_t pid = fork();
-	if( pid == -1 )
-	{
-		perror( "fork" );
-	}
-	else if( pid == 0 )
-	{
-// TODO: use QDesktopService with Qt4
-		QString url = "http://lmms.sf.net/wiki/index.php?title=Main_Page";
-		execlp( "x-www-browser", "x-www-browser",
-					url.toAscii().constData(), NULL );
-		perror( "execlp" );
-		exit( EXIT_FAILURE );
-	}
+	// file:// alternative for offline help
+	QString url = "http://lmms.sf.net/wiki/index.php?title=Main_Page";
+	QDesktopServices::openUrl( url );
+	// TODO: Handle error
 }
 
 

src/core/piano_roll.cpp

@@ -183,7 +183,10 @@ pianoRoll::pianoRoll( void ) :
 	}
 
 	// add us to workspace
-	engine::getMainWindow()->workspace()->addWindow( this );
+	if( engine::getMainWindow()->workspace() )
+	{
+		engine::getMainWindow()->workspace()->addWindow( this );
+	}
 
 	// add time-line
 	m_timeLine = new timeLine( WHITE_KEY_WIDTH, 32, m_ppt,

src/lib/journalling_object.cpp

@@ -151,15 +151,16 @@ void journallingObject::saveJournal( QDomDocument & _doc,
 	QDomElement journal_de = _doc.createElement( "journal" );
 	journal_de.setAttribute( "id", id() );
 	journal_de.setAttribute( "entries", m_journalEntries.size() );
-	journal_de.setAttribute( "curentry", m_currentJournalEntry -
-						m_journalEntries.begin() );
+	journal_de.setAttribute( "curentry", (int)( m_currentJournalEntry -
+						m_journalEntries.begin() ) );
 	journal_de.setAttribute( "metadata", TRUE );
 
 	for( journalEntryVector::const_iterator it = m_journalEntries.begin();
 					it != m_journalEntries.end(); ++it )
 	{
 		QDomElement je_de = _doc.createElement( "entry" );
-		je_de.setAttribute( "pos", it - m_journalEntries.begin() );
+		je_de.setAttribute( "pos", (int)( it -
+						m_journalEntries.begin() ) );
 		je_de.setAttribute( "actionid", it->actionID() );
 		je_de.setAttribute( "data", base64::encode( it->data() ) );
 		journal_de.appendChild( je_de );

src/tracks/instrument_track.cpp

@@ -114,7 +114,10 @@ instrumentTrack::instrumentTrack( trackContainer * _tc ) :
 	}
 
 
-	engine::getMainWindow()->workspace()->addWindow( this );
+	if( engine::getMainWindow()->workspace() )
+	{
+		engine::getMainWindow()->workspace()->addWindow( this );
+	}
 
 	setAcceptDrops( TRUE );
 

src/widgets/effect_label.cpp

@@ -62,7 +62,10 @@ effectLabel::effectLabel( const QString & _initial_name, QWidget * _parent,
 						m_track, 
 						m_track->getAudioPort() );
 
-	engine::getMainWindow()->workspace()->addWindow( m_effWidget );
+	if( engine::getMainWindow()->workspace() )
+	{
+		engine::getMainWindow()->workspace()->addWindow( m_effWidget );
+	}
 
  	m_effWidget->setWindowTitle( _initial_name );
 	m_effWidget->setFixedSize( 240, 242 );