[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src commands/PlayHeadMove.cpp commands...
From: |
Ben Levitt |
Subject: |
[Traverso-commit] traverso/src commands/PlayHeadMove.cpp commands... |
Date: |
Tue, 08 May 2007 22:13:40 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Ben Levitt <benjie> 07/05/08 22:13:40
Modified files:
src/commands : PlayHeadMove.cpp SplitClip.cpp
WorkCursorMove.cpp
src/core : Song.cpp Utils.cpp Utils.h
src/traverso/dialogs/project: ProjectManagerDialog.cpp
src/traverso/songcanvas: AudioClipView.cpp MarkerView.cpp
TimeLineView.cpp
src/traverso/widgets: InfoWidgets.cpp
Log message:
show 2 or 3 digits past the decimal place depending upon the current
scalefactor
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/PlayHeadMove.cpp?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/SplitClip.cpp?cvsroot=traverso&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/WorkCursorMove.cpp?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Utils.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Utils.h?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/ProjectManagerDialog.cpp?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/MarkerView.cpp?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.26&r2=1.27
Patches:
Index: commands/PlayHeadMove.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/PlayHeadMove.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- commands/PlayHeadMove.cpp 6 May 2007 00:02:37 -0000 1.5
+++ commands/PlayHeadMove.cpp 8 May 2007 22:13:40 -0000 1.6
@@ -94,7 +94,7 @@
}
m_sv->update_shuttle_factor();
- cpointer().get_viewport()->set_holdcursor_text(frame_to_msms(newpos,
m_song->get_rate()));
+ cpointer().get_viewport()->set_holdcursor_text(frame_to_text(newpos,
m_song->get_rate(), m_sv->scalefactor));
// Hmm, the alignment of the holdcursor isn't in the center, so we have
to
// substract half the width of it to make it appear centered... :-(
cpointer().get_viewport()->set_holdcursor_pos(QPoint(cpointer().scene_x() - 16,
cpointer().scene_y() - 16));
Index: commands/SplitClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/SplitClip.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- commands/SplitClip.cpp 6 May 2007 00:02:37 -0000 1.27
+++ commands/SplitClip.cpp 8 May 2007 22:13:40 -0000 1.28
@@ -180,7 +180,7 @@
}
m_splitcursor->setPos(xpos, 0);
m_sv->update_shuttle_factor();
-
cpointer().get_viewport()->set_holdcursor_text(frame_to_msms(m_splitPoint,
m_clip->get_song()->get_rate()));
+
cpointer().get_viewport()->set_holdcursor_text(frame_to_text(m_splitPoint,
m_clip->get_song()->get_rate(), m_sv->scalefactor));
cpointer().get_viewport()->set_holdcursor_pos(QPoint(cpointer().scene_x() - 16,
cpointer().scene_y() - 16));
return 1;
Index: commands/WorkCursorMove.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/WorkCursorMove.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- commands/WorkCursorMove.cpp 6 May 2007 00:02:37 -0000 1.4
+++ commands/WorkCursorMove.cpp 8 May 2007 22:13:40 -0000 1.5
@@ -96,7 +96,7 @@
m_song->set_work_at(newFrame);
m_sv->update_shuttle_factor();
- cpointer().get_viewport()->set_holdcursor_text(frame_to_msms(newFrame,
m_song->get_rate()));
+ cpointer().get_viewport()->set_holdcursor_text(frame_to_text(newFrame,
m_song->get_rate(), m_sv->scalefactor));
// Hmm, the alignment of the holdcursor isn't in the center, so we have
to
// substract half the width of it to make it appear centered... :-(
cpointer().get_viewport()->set_holdcursor_pos(QPoint(cpointer().scene_x() - 16,
cpointer().scene_y() - 16));
Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- core/Song.cpp 8 May 2007 01:15:59 -0000 1.87
+++ core/Song.cpp 8 May 2007 22:13:40 -0000 1.88
@@ -355,7 +355,7 @@
spec->total_frames = spec->end_frame - spec->start_frame;
-// PWARN("Render length is: %s",frame_to_msms(spec->total_frames,
m_project->get_rate()).toAscii().data() );
+// PWARN("Render length is: %s",frame_to_ms_3(spec->total_frames,
m_project->get_rate()).toAscii().data() );
spec->pos = spec->start_frame;
transportFrame = spec->start_frame;
@@ -939,11 +939,8 @@
nframes_t end = m_end->get_when();
nframes_t length = end - start;
- QString s_start = frame_to_msms(start, m_project->get_rate());
- QString s_length = frame_to_msms(length, m_project->get_rate());
-
- s_start.replace(QRegExp("[" + QRegExp::escape(",.;") + "]"),
":");
- s_length.replace(QRegExp("[" + QRegExp::escape(",.;") + "]"),
":");
+ QString s_start = frame_to_cd(start, m_project->get_rate());
+ QString s_length = frame_to_cd(length, m_project->get_rate());
out << " FILE \"" << spec->name << "\" " << s_start << " " <<
s_length << "\n\n";
}
Index: core/Utils.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Utils.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- core/Utils.cpp 6 May 2007 00:02:38 -0000 1.10
+++ core/Utils.cpp 8 May 2007 22:13:40 -0000 1.11
@@ -48,8 +48,18 @@
return spos;
}
+// Frame to MM:SS.9{2-3} (hundredths or ms, based on scalefactor)
+QString frame_to_text(nframes_t nframes, int rate, int scalefactor)
+{
+ if (scalefactor >= 512) {
+ return frame_to_ms_2(nframes, rate);
+ } else {
+ return frame_to_ms_3(nframes, rate);
+ }
+}
+
// Frame to MM:SS.999 (ms)
-QString frame_to_msms ( nframes_t nframes, int rate )
+QString frame_to_ms_3 ( nframes_t nframes, int rate )
{
QString spos;
long unsigned int remainder;
@@ -65,8 +75,8 @@
return spos;
}
-// Frame to MM:SS.9 (tenths of a second)
-QString frame_to_mst ( nframes_t nframes, int rate )
+// Frame to MM:SS.99 (hundredths)
+QString frame_to_ms_2 ( nframes_t nframes, int rate )
{
QString spos;
long unsigned int remainder;
@@ -76,8 +86,8 @@
remainder = nframes - ( mins * 60 * rate );
secs = remainder / rate;
remainder -= secs * rate;
- frames = remainder / ( rate / 10 );
- spos.sprintf ( " %02d:%02d%c%01d", mins, secs,
QLocale::system().decimalPoint().toAscii(), frames );
+ frames = remainder * 100 / rate;
+ spos.sprintf ( " %02d:%02d%c%02d", mins, secs,
QLocale::system().decimalPoint().toAscii(), frames );
return spos;
}
Index: core/Utils.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Utils.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- core/Utils.h 6 May 2007 00:02:38 -0000 1.10
+++ core/Utils.h 8 May 2007 22:13:40 -0000 1.11
@@ -30,9 +30,10 @@
class QString;
+QString frame_to_text(nframes_t nframes, int rate, int scalefactor);
QString frame_to_smpte(nframes_t nframes, int rate);
-QString frame_to_msms(nframes_t nframes, int rate);
-QString frame_to_mst(nframes_t nframes, int rate);
+QString frame_to_ms_3(nframes_t nframes, int rate);
+QString frame_to_ms_2(nframes_t nframes, int rate);
QString frame_to_cd(nframes_t nframes, int rate);
QString frame_to_hms(double nframes, int rate);
QString frame_to_ms(double nframes, int rate);
Index: traverso/dialogs/project/ProjectManagerDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/ProjectManagerDialog.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- traverso/dialogs/project/ProjectManagerDialog.cpp 6 May 2007 00:02:38
-0000 1.12
+++ traverso/dialogs/project/ProjectManagerDialog.cpp 8 May 2007 22:13:40
-0000 1.13
@@ -101,7 +101,7 @@
QString songNr =
QString::number(m_project->get_song_index(song->get_id()));
QString songName = "Song " + songNr + " - " + song->get_title();
QString numberOfTracks = QString::number(song->get_numtracks());
- QString songLength = frame_to_msms(song->get_last_frame(),
song->get_rate());
+ QString songLength = frame_to_ms_2(song->get_last_frame(),
song->get_rate());
QString songStatus = song->is_changed()?"UnSaved":"Saved";
QString songSpaceAllocated = "Unknown";
Index: traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- traverso/songcanvas/AudioClipView.cpp 7 May 2007 18:14:38 -0000
1.61
+++ traverso/songcanvas/AudioClipView.cpp 8 May 2007 22:13:40 -0000
1.62
@@ -211,7 +211,7 @@
}
if (m_dragging) {
- m_posIndicator->set_value(frame_to_msms( (nframes_t)(x() *
m_sv->scalefactor), m_song->get_rate()));
+ m_posIndicator->set_value(frame_to_text( (nframes_t)(x() *
m_sv->scalefactor), m_song->get_rate(), m_sv->scalefactor));
}
painter->restore();
Index: traverso/songcanvas/MarkerView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/MarkerView.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- traverso/songcanvas/MarkerView.cpp 7 May 2007 18:14:38 -0000 1.13
+++ traverso/songcanvas/MarkerView.cpp 8 May 2007 22:13:40 -0000 1.14
@@ -84,8 +84,8 @@
painter->drawText(m_width + 1, m_ascent, m_marker->get_description());
if (m_dragging) {
- m_posIndicator->set_value(frame_to_msms( (x() +
m_boundingRect.width() / 2 ) * m_sv->scalefactor,
- m_sv->get_song()->get_rate()));
+ m_posIndicator->set_value(frame_to_text( (x() +
m_boundingRect.width() / 2 ) * m_sv->scalefactor,
+ m_sv->get_song()->get_rate(),
m_sv->scalefactor));
}
painter->restore();
Index: traverso/songcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- traverso/songcanvas/TimeLineView.cpp 7 May 2007 18:14:38 -0000
1.29
+++ traverso/songcanvas/TimeLineView.cpp 8 May 2007 22:13:40 -0000
1.30
@@ -263,8 +263,6 @@
major = 120 * m_sv->scalefactor;
}
- bool showMs = (m_sv->scalefactor < 512);
-
// minor is double so they line up right with the majors,
// despite not always being an even number of frames
double minor = major/10.0;
@@ -281,7 +279,7 @@
// Draw major ticks
for (nframes_t frame = ((int)(firstFrame/major))*major; frame <
lastFrame; frame += major ) {
painter->drawLine(frame/m_sv->scalefactor, height - 13,
frame/m_sv->scalefactor, height - 1);
- painter->drawText(frame/m_sv->scalefactor + 4, height - 8,
(showMs) ? frame_to_msms(frame, m_samplerate) : frame_to_ms(frame,
m_samplerate));
+ painter->drawText(frame/m_sv->scalefactor + 4, height - 8,
frame_to_text(frame, m_samplerate, m_sv->scalefactor));
}
}
Index: traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- traverso/widgets/InfoWidgets.cpp 7 May 2007 21:29:07 -0000 1.26
+++ traverso/widgets/InfoWidgets.cpp 8 May 2007 22:13:40 -0000 1.27
@@ -482,7 +482,7 @@
if (!m_song) {
currentTime = "0:00.0";
} else {
- currentTime = frame_to_mst(m_song->get_transport_frame(),
m_song->get_rate());
+ currentTime = frame_to_ms_2(m_song->get_transport_frame(),
m_song->get_rate());
}
int fc = 170;