diff --git a/include/surround_area.h b/include/surround_area.h deleted file mode 100644 index a26ecfc0c..000000000 --- a/include/surround_area.h +++ /dev/null @@ -1,118 +0,0 @@ -/* - * surround_area.h - class surroundArea which provides widget for setting - * position of a channel + calculation of volume for each - * speaker - * - * Copyright (c) 2004-2008 Tobias Doerffel - * - * 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 _SURROUND_AREA_H -#define _SURROUND_AREA_H - -#include - -#include "AutomatableModel.h" -#include "Mixer.h" - - -class QPixmap; -class knob; - - -const int SURROUND_AREA_SIZE = 1024; - - -class surroundAreaModel : public Model -{ - Q_OBJECT - mapPropertyFromModel(int,x,setX,m_posX); - mapPropertyFromModel(int,y,setY,m_posY); -public: - surroundAreaModel( Model * _parent, - bool _default_constructed = false ); - - surroundVolumeVector getVolumeVector( float _v_scale ) const; - - void saveSettings( QDomDocument & _doc, QDomElement & _this, - const QString & _name = "surpos" ); - void loadSettings( const QDomElement & _this, - const QString & _name = "surpos" ); - - inline void prepareJournalEntryFromOldVal() - { - m_posX.prepareJournalEntryFromOldVal(); - m_posY.prepareJournalEntryFromOldVal(); - } - - inline void addJournalEntryFromOldToCurVal() - { - m_posX.addJournalEntryFromOldToCurVal(); - m_posY.addJournalEntryFromOldToCurVal(); - } - -// AutomationPattern * automationPatternX(); -// AutomationPattern * automationPatternY(); - - -private: - IntModel m_posX; - IntModel m_posY; - -} ; - - -/* -class surroundArea : public QWidget, public ModelView -{ - Q_OBJECT -public: - surroundArea( QWidget * _parent, const QString & _name ); - virtual ~surroundArea(); - - - surroundAreaModel * model() - { - return( castModel() ); - } - - const surroundAreaModel * model() const - { - return( castModel() ); - } - - -protected: - virtual void contextMenuEvent( QContextMenuEvent * _me ); - virtual void paintEvent( QPaintEvent * _pe ); - virtual void mousePressEvent( QMouseEvent * _me ); - virtual void mouseMoveEvent( QMouseEvent * _me ); - virtual void mouseReleaseEvent( QMouseEvent * _me ); - - -private: - static QPixmap * s_backgroundArtwork; - -} ; -*/ - -#endif - diff --git a/include/volume.h b/include/volume.h index b99d89d5d..0890f5152 100644 --- a/include/volume.h +++ b/include/volume.h @@ -41,16 +41,6 @@ typedef struct } stereoVolumeVector; -typedef struct -{ -#ifndef LMMS_DISABLE_SURROUND - float vol[4]; -#else - float vol[2]; -#endif -} surroundVolumeVector; - - inline int volumeToMidi( volume_t vol ) { return qMin( MidiMaxVelocity, vol * MidiMaxVelocity / DefaultVolume ); diff --git a/src/core/surround_area.cpp b/src/core/surround_area.cpp deleted file mode 100644 index 605d1537e..000000000 --- a/src/core/surround_area.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/* - * surround_area.cpp - a widget for setting position of a channel + - * calculation of volume for each speaker - * - * Copyright (c) 2004-2009 Tobias Doerffel - * - * 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. - * - */ - -#include - -#include "surround_area.h" -#include "templates.h" - - -surroundAreaModel::surroundAreaModel( ::Model * _parent, - bool _default_constructed ) : - Model( _parent, QString::null, _default_constructed ), - m_posX( 0, -SURROUND_AREA_SIZE, SURROUND_AREA_SIZE, _parent ), - m_posY( 0, -SURROUND_AREA_SIZE, SURROUND_AREA_SIZE, _parent ) -{ - connect( &m_posX, SIGNAL( dataChanged() ), - this, SIGNAL( dataChanged() ) ); - connect( &m_posY, SIGNAL( dataChanged() ), - this, SIGNAL( dataChanged() ) ); -} - - - - -surroundVolumeVector surroundAreaModel::getVolumeVector( float _v_scale ) const -{ - surroundVolumeVector v = { { _v_scale, _v_scale -#ifndef LMMS_DISABLE_SURROUND - , _v_scale, _v_scale -#endif - } } ; - - if( x() >= 0 ) - { - v.vol[0] *= 1.0f - x() / (float)SURROUND_AREA_SIZE; -#ifndef LMMS_DISABLE_SURROUND - v.vol[2] *= 1.0f - x() / (float)SURROUND_AREA_SIZE; -#endif - } - else - { - v.vol[1] *= 1.0f + x() / (float)SURROUND_AREA_SIZE; -#ifndef LMMS_DISABLE_SURROUND - v.vol[3] *= 1.0f + x() / (float)SURROUND_AREA_SIZE; -#endif - } - - if( y() >= 0 ) - { - v.vol[0] *= 1.0f - y() / (float)SURROUND_AREA_SIZE; - v.vol[1] *= 1.0f - y() / (float)SURROUND_AREA_SIZE; - } -#ifndef LMMS_DISABLE_SURROUND - else - { - v.vol[2] *= 1.0f + y() / (float)SURROUND_AREA_SIZE; - v.vol[3] *= 1.0f + y() / (float)SURROUND_AREA_SIZE; - } -#endif - - return( v ); -} - - - -void surroundAreaModel::saveSettings( QDomDocument & _doc, - QDomElement & _this, - const QString & _name ) -{ - m_posX.saveSettings( _doc, _this, _name + "-x" ); - m_posY.saveSettings( _doc, _this, _name + "-y" ); -} - - - - -void surroundAreaModel::loadSettings( const QDomElement & _this, - const QString & _name ) -{ - if( _this.hasAttribute( _name ) ) - { - const int i = _this.attribute( _name ).toInt(); - m_posX.setValue( (float)( ( i & 0xFFFF ) - 2 * SURROUND_AREA_SIZE ) ); - m_posY.setValue( (float)( ( i >> 16 ) - 2 * SURROUND_AREA_SIZE ) ); - } - else - { - m_posX.loadSettings( _this, _name + "-x" ); - m_posY.loadSettings( _this, _name + "-y" ); - } -} - - -#include "moc_surround_area.cxx" - - diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index e0d18c7cf..d36cf17e3 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -73,7 +73,6 @@ #include "SamplePlayHandle.h" #include "song.h" #include "string_pair_drag.h" -#include "surround_area.h" #include "tab_widget.h" #include "tooltip.h" #include "track_label_button.h"