hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

DrumSynth relicense, MDI fixes, QPushButton inheritance, LiveTool fixes

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@604 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Javier Serrano Polo
2007-11-20 20:29:36 +00:00
parent b61a93c5d3
commit f8c17137ad
34 changed files with 339 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/automatable_button.h
View File

@@ -26,7 +26,7 @@
#ifndef _AUTOMATABLE_BUTTON_H
#define _AUTOMATABLE_BUTTON_H
#include <QtGui/QWidget>
#include <QtGui/QPushButton>
#include "automatable_object.h"
@@ -34,7 +34,7 @@
class automatableButtonGroup;
class automatableButton : public QWidget, public automatableObject<bool,
class automatableButton : public QPushButton, public automatableObject<bool,
signed char>
{
Q_OBJECT
@@ -44,22 +44,12 @@ public:
virtual ~automatableButton();
inline virtual bool isChecked( void ) const
{
return( value() );
}
virtual void setValue( const bool _on );
inline void setCheckable( bool _on )
{
m_checkable = _on;
setJournalling( m_checkable );
}
inline bool isCheckable( void ) const
{
return( m_checkable );
QPushButton::setCheckable( _on );
setJournalling( _on );
}
@@ -67,6 +57,7 @@ public slots:
virtual void toggle( void );
virtual void setChecked( bool _on )
{
// QPushButton::setChecked is called in setValue()
setValue( _on );
}
@@ -79,16 +70,10 @@ protected:
private:
automatableButtonGroup * m_group;
bool m_checkable;
friend class automatableButtonGroup;
signals:
void clicked( void );
void toggled( bool );
} ;

52
include/drumsynth.h
View File

@@ -1,30 +1,28 @@
// DrumSynth DS file renderer
// Copyright (c)1998-2000 Paul Kellett (mda-vst.com)
// Licensed under the MIT License. Read drumsynth.LICENSE for details
// Version 2.0 (5/10/00)
//
// Adapted for LMMS 2007 Paul Giblock
//
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
// files (the "Software"), to deal in the Software without
// restriction, including without limitation the rights to use,
// copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following
// conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
/*
* drumsynth.h - DrumSynth DS file renderer
*
* Copyright (c) 1998-2000 Paul Kellett (mda-vst.com)
* Copyright (c) 2007 Paul Giblock <drfaygo/at/gmail.com>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program (see COPYING); if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
*/
#ifndef _DRUMSYNTH_H__
#define _DRUMSYNTH_H__

13
include/effect_label.h
View File

@@ -27,12 +27,13 @@
#define _EFFECT_LABEL_H
#include <QtGui/QWidget>
#include <QtGui/QPushButton>
#include <QtGui/QLabel>
#include "journalling_object.h"
class QLabel;
class QPushButton;
class effectTabWidget;
class sampleTrack;
class tabWidget;
@@ -56,11 +57,12 @@ public:
{
return( "sample_track" );
}
public slots:
void showEffects( void );
void closeEffects( void );
void rename( void );
signals:
void clicked( void );
@@ -68,18 +70,21 @@ signals:
void nameChanged( const QString & _new_name );
void pixmapChanged( void );
protected:
virtual void mousePressEvent( QMouseEvent * _me );
virtual void mouseDoubleClickEvent( QMouseEvent * _me );
private:
sampleTrack * m_track;
bool m_show;
QLabel * m_label;
QPushButton * m_effectBtn;
tabWidget * m_tabWidget;
effectTabWidget * m_effWidget;
QWidget * m_effWindow;
};
#endif

12
include/effect_tab_widget.h
View File

@@ -28,13 +28,13 @@
#define _EFFECT_TAB_WIDGET_H
#include <QtGui/QWidget>
#include <QtGui/QPushButton>
#include <QtGui/QLayout>
#include "journalling_object.h"
#include "rack_view.h"
class QPushButton;
class audioPort;
class groupBox;
class instrumentTrack;
@@ -68,19 +68,11 @@ public:
}
signals:
void closed( void );
private slots:
void addEffect( void );
void setBypass( bool _state );
protected:
virtual void closeEvent( QCloseEvent * _ce );
private:
track * m_track;
audioPort * m_port;

4
include/main_window.h
View File

@@ -28,12 +28,12 @@
#include <QtCore/QList>
#include <QtGui/QMainWindow>
#include <QtGui/QMdiArea>
#include <QtGui/QWhatsThis>
class QAction;
class QDomElement;
class QGridLayout;
class QMdiArea;
class QSplashScreen;
class configManager;
@@ -123,6 +123,8 @@ private:
void finalize( void );
void toggleWindow( QWidget * _w );
QMdiArea * m_workspace;

8
include/tool.h
View File

@@ -31,19 +31,15 @@
#include "plugin.h"
class mainWindow;
class tool : public QWidget, public plugin
{
public:
tool( mainWindow * _window, const descriptor * _descriptor );
tool( const descriptor * _descriptor );
virtual ~tool();
// instantiate tool-plugin with given name or return NULL
// on failure
static tool * FASTCALL instantiate( const QString & _plugin_name,
mainWindow * _window );
static tool * FASTCALL instantiate( const QString & _plugin_name );
} ;