diff --git a/ChangeLog b/ChangeLog index bd8d1c98c..81bb0ffbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-02-02 Tobias Doerffel + + * configure.in: + made 0.1.4 release + + * Makefile.am: + added -rdynamic-switch again to make LMMS able to load plugins + + * include/track_container.h: + fixed bug which caused LMMS not being compilable using GCC 3 + 2006-02-01 Tobias Doerffel * configure.in: diff --git a/Makefile.am b/Makefile.am index b00f0a834..6193590f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -331,5 +331,6 @@ LIB_SF_LDADD = -lsndfile endif lmms_LDADD = $(QT_LDADD) $(LIB_SDL_LDADD) $(LIB_ASOUND_LDADD) $(LIB_JACK_LDADD) $(LIB_SDL_SOUND_LDADD) $(LIB_VORBIS_LDADD) $(LIB_SRC_LDADD) $(LIB_SF_LDADD) $(LIB_FST_LDADD) -ldl -# lmms_LDFLAGS = -rdynamic -rpath $(pkglibdir) +lmms_LDFLAGS = -rdynamic +#-rpath $(pkglibdir) diff --git a/configure.in b/configure.in index 129e32d20..506eabc1f 100644 --- a/configure.in +++ b/configure.in @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) -AC_INIT(lmms, 0.1.3, tobydox/at/users/dot/sourceforge/dot/net) -AM_INIT_AUTOMAKE(lmms, 0.1.3) +AC_INIT(lmms, 0.1.4, tobydox/at/users/dot/sourceforge/dot/net) +AM_INIT_AUTOMAKE(lmms, 0.1.4) AM_CONFIG_HEADER(config.h) diff --git a/include/track_container.h b/include/track_container.h index fe58b667b..c65142655 100644 --- a/include/track_container.h +++ b/include/track_container.h @@ -118,7 +118,9 @@ public: { return( m_rubberBand->selectedObjects() ); } - return( vvector() ); + //return( vvector() ); + vvector foo; + return( foo ); } diff --git a/lmms.1 b/lmms.1 new file mode 100644 index 000000000..398cea0bc --- /dev/null +++ b/lmms.1 @@ -0,0 +1,49 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH LMMS 1 "February 01, 2006" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +lmms \- software for easy music-production +.SH SYNOPSIS +.B lmms +.RB "[ \-\fBr\fP \fIfile\fP ]" +.RB "[ \-\fBo\fP \fIformat\fP ]" +.br +.B lmms +.RI "[ file ]" +.SH DESCRIPTION +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +.B LMMS +aims to be a free alternative to popular (but commercial and closed- source) programs like FruityLoops, Cubase and Logic giving you the ability of producing music with your computer by creating cool loops, synthesizing and mixing sounds, arranging samples, having fun with your MIDI-keyboard and much more... + +LMMS combines the features of a tracker-/sequencer-program (pattern-/channel-/ sample-/song-/effect-management) and those of powerful instrument-plugins and samplers in a modern, user-friendly and easy to use graphical user-interface. + +.SH OPTIONS +.IP "\fB\-r, --render\fP \fIfile\fP +Render given file to either a wav\- or ogg\-file. See \fB\-o\fP for details +.IP "\fB\-o, --output\fP \fIformat\fP +Specify format of render-output where \fIformat\fP is either 'wav' or 'ogg' +.SH SEE ALSO +.BR http://lmms.sf.net/ +.SH AUTHOR +lmms was written by Tobias Doerffel and others. See AUTHORS for details. +.PP +This manual page was written by Florian Ragwitz and +Tobias Doerffel , for the Debian project (but may be +used by others). diff --git a/src/core/plugin.cpp b/src/core/plugin.cpp index b6c412815..21f34390d 100644 --- a/src/core/plugin.cpp +++ b/src/core/plugin.cpp @@ -106,8 +106,8 @@ plugin * plugin::instantiate( const QString & _plugin_name, void * _data ) ascii() #endif , RTLD_NOW );*/ - QLibrary plugin_lib( configManager::inst()->pluginDir() + - _plugin_name ); + QLibrary plugin_lib( configManager::inst()->pluginDir() + + _plugin_name ); if( /*handle == NULL*/ plugin_lib.load() == FALSE ) { QMessageBox::information( NULL,