Merge in from master.

1 files changed, 0 insertions, 78 deletions

diff --git a/dgedit/samplesorter.h b/dgedit/samplesorter.h
deleted file mode 100644
index ada7fd8..0000000
--- a/dgedit/samplesorter.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/***************************************************************************
- *            samplesorter.h
- *
- *  Mon Nov 30 07:45:58 CET 2009
- *  Copyright 2009 Bent Bisballe Nyeng
- *  deva@aasimon.org
- ****************************************************************************/
-
-/*
- *  This file is part of DrumGizmo.
- *
- *  DrumGizmo 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.
- *
- *  DrumGizmo 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 DrumGizmo; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
- */
-#ifndef __DRUMGIZMO_SAMPLESORTER_H__
-#define __DRUMGIZMO_SAMPLESORTER_H__
-
-#include <QWidget>
-#include <QVector>
-#include "selection.h"
-
-class SampleSorter : public QWidget {
-Q_OBJECT
-public:
-  SampleSorter(Selections &selections, Selections &selections_preview);
-
-public slots:
-  void setWavData(const float *data, size_t size);
-  void setAttackLength(int len);
-  int attackLength();
-
-  void addSelection(sel_id_t id);
-  void addSelectionPreview(sel_id_t id);
-
-  void relayout();
-
-  void setShowPreview(bool show_preview);
-
-protected:
-  void paintEvent(QPaintEvent *event);
-  void mouseMoveEvent(QMouseEvent *event);
-  void mousePressEvent(QMouseEvent *event);
-  void mouseReleaseEvent(QMouseEvent *event);
-
-private:
-  sel_id_t getSelectionByCoordinate(int x, int y);
-
-  Selections &selections;
-  Selections &selections_preview;
-
-  bool show_preview;
-
-  float min;
-  float max;
-  int attlen;
-
-  // Wav data
-  const float *data;
-  size_t size;
-
-  Selection sel;
-
-  sel_id_t sel_moving;
-};
-
-#endif/*__DRUMGIZMO_SAMPLESORTER_H__*/