diff options
| author | Florian Jung <flo@windfisch.org> | 2011-09-10 17:06:00 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-09-10 17:06:00 +0000 |
| commit | 24f84a489364741eb3fc126a3f83d91a86b65e27 (patch) | |
| tree | 63a4e20aaf4a2ebd2462c91b574eddceeac31170 /muse2/muse/widgets/poslabel.cpp | |
| parent | 38c5cccc7273247353264bb7dc97f42296d8e259 (diff) | |
| parent | 2120ea4f083228dde0d7307203391a4ec8f57e2d (diff) | |
merged the first bunch of orcans changes
STILL WAIT WITH COMMITTING NEW STUFF! i have to merge the rest as well!
this is a bit buggy (connect errors, not tested much), but doesn't
segfault immediately
Diffstat (limited to 'muse2/muse/widgets/poslabel.cpp')
| -rw-r--r-- | muse2/muse/widgets/poslabel.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/muse2/muse/widgets/poslabel.cpp b/muse2/muse/widgets/poslabel.cpp index 78903a1f..98a7eba3 100644 --- a/muse2/muse/widgets/poslabel.cpp +++ b/muse2/muse/widgets/poslabel.cpp @@ -3,6 +3,21 @@ // Linux Music Editor // $Id: poslabel.cpp,v 1.2.2.2 2009/04/06 01:24:55 terminator356 Exp $ // (C) Copyright 2001 Werner Schweer (ws@seh.de) +// +// 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; 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; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// //========================================================= #include <stdlib.h> @@ -20,6 +35,8 @@ extern int mtcType; +namespace MusEWidget { + //--------------------------------------------------------- // PosLabel //--------------------------------------------------------- @@ -66,7 +83,7 @@ void PosLabel::updateValue() { QString s; if (_smpte) { - double time = double(_sampleValue) / double(sampleRate); + double time = double(_sampleValue) / double(MusEGlobal::sampleRate); int min = int(time) / 60; int sec = int(time) % 60; double rest = time - (min * 60 + sec); @@ -154,3 +171,4 @@ void PosLabel::setSmpte(bool val) updateValue(); } +} // namespace MusEWidget |