[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso resources/help/quickstartreference.htm...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso resources/help/quickstartreference.htm... |
|
Date: |
Tue, 15 May 2007 20:06:31 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/05/15 20:06:31
Modified files:
resources/help : quickstartreference.html
src : config.h
src/core : AudioClip.cpp AudioSource.cpp Project.cpp
src/traverso : Interface.cpp
Log message:
* removed unused code in audiosource
* AudioClip recording bug fixed (source endframe not set)
* quickstart reference uses keymap html export
* keymap html export fix
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/help/quickstartreference.html?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/config.h?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioSource.cpp?cvsroot=traverso&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.81&r2=1.82
Patches:
Index: resources/help/quickstartreference.html
===================================================================
RCS file: /sources/traverso/traverso/resources/help/quickstartreference.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- resources/help/quickstartreference.html 29 Aug 2006 10:28:00 -0000
1.4
+++ resources/help/quickstartreference.html 15 May 2007 20:06:30 -0000
1.5
@@ -17,346 +17,8 @@
<h2>Quick Start Reference</h2>
-Some of the most frequently used commands can be found here.<br />
-Note that it's NOT the full command reference!<br />
-<br />
-The commands are grouped in a number of sections, starting with the ones which
don't have a graphical representation, like Project Management, and (partially)
the Song.
+<h3>AudioClip</h3><table><tr><td width=220><b>Description</b></td><td><b>Key
Sequence</b></td></tr><tr><td>Copy Clip</td><td> (CTRL+) [ MouseButtonLeft ] ,
[ C ]</td></tr><tr><td>Drag Edge</td><td> [ E ]</td></tr><tr><td>External
Processing</td><td> < E ></td></tr><tr><td>Fade
In/Out    In/Out: Range</td><td> [ F
]</td></tr><tr><td>Fade In/Out    In/Out: Reset</td><td>
<< F >></td></tr><tr><td>Fade In/Out    In:
Range</td><td> [ F G ]</td></tr><tr><td>Fade In/Out    In:
Reset</td><td> << F G >></td></tr><tr><td>Fade
In/Out    In: Select shape</td><td> < F G
></td></tr><tr><td>Fade In/Out    Out: Range</td><td> [ G H
]</td></tr><tr><td>Fade In/Out    Out: Reset</td><td>
<< G H >></td></tr><tr><td>Fade In/Out    Out: Select
shape</td><td> < G H ></td></tr><tr><td>Fade
In/Out    Reset both</td><td> << F H
>></td></tr><tr><td>Gain: Reset</td><td> << G
>></td></tr><tr><td>Gain</td><td> [ G ]</td></tr><tr><td>Move Clip</td><td> [
MouseButtonLeft ] , [ D ] , << END >></td></tr><tr><td>Move
Clip</td><td> << HOME >></td></tr><tr><td>Mute</td><td> < U
></td></tr><tr><td>Normalize: reset</td><td> << N
>></td></tr><tr><td>Normalize</td><td> < N ></td></tr><tr><td>Remove
Clip</td><td> << R >></td></tr><tr><td>Reset Audio File</td><td> <
MouseButtonLeft ></td></tr><tr><td>Split</td><td> [ X ] , < X
></td></tr></table></br></br><h3>Curve</h3><table><tr><td
width=220><b>Description</b></td><td><b>Key Sequence</b></td></tr><tr><td>Move
node</td><td> [ D ] , [ MouseButtonLeft ]</td></tr><tr><td>New node</td><td>
<< MouseButtonLeft >> , < C ></td></tr><tr><td>Remove node</td><td>
<< R >></td></tr></table></br></br><h3>Fade</h3><table><tr><td
width=220><b>Description</b></td><td><b>Key
Sequence</b></td></tr><tr><td>Bend</td><td> [ B
]</td></tr><tr><td>Reset</td><td> < L ></td></tr><tr><td>Set Mode</td><td>
< M ></td></tr><tr><td>Strength</td><td> [ S ]</td></tr><tr><td>Toggle
bypass</td><td> < B ></td></tr><tr><td>Toggle raster</td><td> < R
></td></tr></table></br></br><h3>Interface</h3><table><tr><td
width=220><b>Description</b></td><td><b>Key Sequence</b></td></tr><tr><td>About
Traverso</td><td> < A B ></td></tr><tr><td>Export keymap</td><td> < F12
></td></tr><tr><td>Full Screen</td><td> < F11 ></td></tr><tr><td>Show
Context Menu</td><td> < MouseButtonRight > , < Q
></td></tr><tr><td>Show Export Dialog</td><td> << ENTER >> , <<
RETURN >></td></tr><tr><td>Show Project Management Dialog</td><td> < F4
></td></tr></table></br></br><h3>Marker</h3><table><tr><td
width=220><b>Description</b></td><td><b>Key
Sequence</b></td></tr></table></br></br><h3>Plugin</h3><table><tr><td
width=220><b>Description</b></td><td><b>Key
Sequence</b></td></tr><tr><td>Bypass: On/Off</td><td> < B
></td></tr><tr><td>Remove</td><td> << R
>></td></tr><tr><td>Settings...</td><td> < E
></td></tr></table></br></br><h3>ProjectManager</h3><table><tr><td
width=220><b>Description</b></td><td><b>Key Sequence</b></td></tr><tr><td>Exit
application</td><td> << ESC >></td></tr><tr><td>Save Project</td><td>
< CTRL S ></td></tr></table></br></br><h3>Song</h3><table><tr><td
width=220><b>Description</b></td><td><b>Key Sequence</b></td></tr><tr><td>Add
Marker</td><td> < M ></td></tr><tr><td>Arm Tracks</td><td> [ A
]</td></tr><tr><td>Arm: On/Off</td><td> << A >></td></tr><tr><td>Gain:
Reset</td><td> << G >></td></tr><tr><td>Gain</td><td> [ S G ] , [ G
]</td></tr><tr><td>Mode: Curve</td><td> < F2 ></td></tr><tr><td>Mode:
Edit</td><td> < F1 ></td></tr><tr><td>Mute: On/Off</td><td> << U
>></td></tr><tr><td>New Track</td><td> << T
>></td></tr><tr><td>Play</td><td> < SPACE ></td></tr><tr><td>Playhead:
Move</td><td> [ SPACE ]</td></tr><tr><td>Playhead: To workcursor</td><td> <
W ></td></tr><tr><td>Record</td><td>(CTRL+) < SPACE
></td></tr><tr><td>Scroll    Down</td><td> <
MouseScrollVerticalDown > , < DARROW
></td></tr><tr><td>Scroll    Left</td><td> < LARROW
></td></tr><tr><td>Scroll    Right</td><td> < RARROW
></td></tr><tr><td>Scroll    Up</td><td> <
MouseScrollVerticalUp > , < UARROW ></td></tr><tr><td>Shuttle</td><td> [ S
]</td></tr><tr><td>Snap: On/Off</td><td> < S N ></td></tr><tr><td>Solo:
On/Off</td><td> << O >></td></tr><tr><td>Work
Cursor    To end</td><td> < END ></td></tr><tr><td>Work
Cursor    To start</td><td> < HOME
></td></tr><tr><td>Work Cursor    Touch</td><td> <
MouseButtonLeft > , < SHIFT ></td></tr><tr><td>Workcursor: Move</td><td>
[ SHIFT ] , [ MouseButtonLeft
]</td></tr><tr><td>Zoom    Horizontal In</td><td> < Z
></td></tr><tr><td>Zoom    Horizontal Out</td><td> (ALT+)
< Z > , < Z X
></td></tr><tr><td>Zoom    Omnidirectional</td><td> [ Z
]</td></tr><tr><td>Zoom    Vertical In</td><td> < Z A
></td></tr><tr><td>Zoom    Vertical Out</td><td> < Z ALT
></td></tr></table></br></br><h3>TimeLine</h3><table><tr><td
width=220><b>Description</b></td><td><b>Key Sequence</b></td></tr><tr><td>Add
Marker</td><td> < M ></td></tr><tr><td>Clear all Markers</td><td> << C
>></td></tr><tr><td>Drag Marker</td><td> [ D ] , [ MouseButtonLeft
]</td></tr><tr><td>Remove Marker</td><td> << R
>></td></tr></table></br></br><h3>Track</h3><table><tr><td
width=220><b>Description</b></td><td><b>Key Sequence</b></td></tr><tr><td>Add
new Plugin</td><td> < F5 ></td></tr><tr><td>Edit properties</td><td> < E
></td></tr><tr><td>Gain: Reset</td><td> << G
>></td></tr><tr><td>Gain</td><td> [ G ]</td></tr><tr><td>Import Audio</td><td>
< I ></td></tr><tr><td>Insert Silence</td><td> < I O
></td></tr><tr><td>Mute</td><td> < U ></td></tr><tr><td>Panorama:
Reset</td><td> << P >></td></tr><tr><td>Panorama</td><td> [ P
]</td></tr><tr><td>Record: On/Off</td><td> < A ></td></tr><tr><td>Remove
Track</td><td> << R >></td></tr><tr><td>Select Bus</td><td> < B
></td></tr><tr><td>Silence other tracks</td><td> [ O
]</td></tr><tr><td>Solo</td><td> < O ></td></tr></table>
-<h3>Sections</h3>
-Key actions are divided in the following categories:<br />
-<br />
-<ul>
-<li><a href="#globalcommands">Global commands</a></li>
-<li><a href="#songcommands">Song commands</a></li>
-<li><a href="#trackcommands">Track commands</a></li>
-<li><a href="#audioclipcommands">AudioClip commands</a></li>
-</ul>
-
-<hr />
-
-<h4><a name="globalcommands">Global commands</h4>
-
-<table cellspacing=10>
-
-<tr>
-<td width=120 align=center>
-< H >
-</td>
-<td>
-This <b>H</b>elp Window ;-)
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< F4 >
-</td>
-<td>
-Switch to the Project Manager View.<br />
-Here you can manage your Project, and settings related to the audio device,
keyboard, and so on.
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< F3 >
-</td>
-<td>
-Switch to the SongView.<br />
-Displays the currently active Song.
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< Q >
-</td>
-<td>
-Show the "Context Menu" for the grahpical object the mouse cursors points to.
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-n.. < S >
-</td>
-<td>
-Switch to Song n<br />
-Typ in the <b>n</b>umber of the <b>S</b>ong you want to show, and type S.<br />
-The "n.." means "Number Collection".
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< CTRL S >
-</td>
-<td>
-<b>S</b>ave the Project.
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< < ESC > >
-</td>
-<td>
-Quit Traverso (Do you really want to do this? ;-) ). <br />
-Of course, you can use the red x button to exit Traverso too.<br />
-Your Project will be saved automatically!
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< < ENTER > >
-</td>
-<td>
-Render Song - Project
-</td>
-</tr>
-
-</table>
-
-<div align=right><a href="qrc:/quickstartreference.html">Top</a></div>
-<hr />
-
-
-<h4><a name="songcommands">Song commands</h4>
-
-<table cellspacing=10>
-<tr>
-
-<td width=120 align=center>
-< SPACE >
-</td>
-<td>
-Go !<br />
-Saying it a bit differently, start playing ;-).<br />
-Issueing the same command again will stop the playing.<br />
-If a Track is "armed" it will also start recording in that Track!
-</td>
-</tr>
-<tr>
-
-<td width=100 align=center>
-< W >
-</td>
-<td>
-Move the "Play Cursor" to the "Edit Cursor", a.k.a. the "<b>W</b>ork Cursor".
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< LEFT SHIFT >
-</td>
-<td>
-Set's the "Work Cursor" to the current mouse cursor position.
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< HOME >
-</td>
-<td>
-Move the "Work Cursor" to the start of the Song.
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-[ S G ]
-</td>
-<td>
-Adjust the Master <b>G</b>ain.
-</td>
-</tr>
-
-
-<tr>
-<td width=100 align=center>
-[ Z ]
-</td>
-<td>
-Omnidirectional <b>Z</b>ooming.
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< Z >
-</td>
-<td>
-<b>Z</b>oom in
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< Z X >
-</td>
-<td>
-<b>Z</b>oom out
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-[ TAB ]
-</td>
-<td>
-The famous Shuttle Tool !!<br />
-The Shuttle tool gives you continues horizontall scroll. The speed is set by
the mouse position.
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< S N >
-</td>
-<td>
-Toggle <b>Sn</b>ap on - off.
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< F5 >
-</td>
-<td>
-Undo
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< F6 >
-</td>
-<td>
-Redo
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< S >
-</td>
-<td>
-<b>S</b>elect an AudioClip
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< < C X > >
-</td>
-<td>
-Delete all AudioClips in Selection.<br />
-This action is un/redoable!<br />
-Another way of removing an AudioClip is to drag it outside of the SongView at
the left or top of the view!
-</td>
-</tr>
-
-</table>
-
-
-<div align=right><a href="qrc:/quickstartreference.html">Top</a></div>
-<hr />
-
-
-<h4><a name="trackcommands">Track commands</h4>
-
-<table cellspacing=10>
-
-<tr>
-<td width=100 align=center>
-< A >
-</td>
-<td>
-<b>A</b>rm the Track.<br />
-The next time the Song starts playing, this Track will record on the specified
Capture Bus.
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< E >
-</td>
-<td>
-<b>E</b>dit Track information (Like Track Name)
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< V B >
-</td>
-<td>
-Select a Capture <b>B</b>us to record from.
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< O >
-</td>
-<td>
-Solo<br />
-All the other Tracks will be silenced.
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-[ O ]
-</td>
-<td>
-Solo this Track, until the hold actions finishes.<br />
-A proper name would perhaps "silence others" ?
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-< U >
-</td>
-<td>
-Mute
-</td>
-</tr>
-
-<tr>
-<td width=100 align=center>
-[ G ]
-</td>
-<td>
-Change <b>G</b>ain.
-</td>
-</tr>
-
-</table>
-
-<div align=right><a href="qrc:/quickstartreference.html">Top</a></div>
-<hr />
-
-
-<h4><a name="audioclipcommands">AudioClip commands</h4>
-
-<table cellspacing=10>
-
-<tr>
-<td width=100 align=center>
-< Q >
-</td>
-<td>
-And you will get a very nice Context Menu for all actions available for an
AudioClip!<br />
-It doesn't make sense to duplicate this information here, since this Context
Menu is rather detailed!
-</td>
-</tr>
-
-</table>
<div align=right><a href="qrc:/quickstartreference.html">Top</a></div>
<hr />
Index: src/config.h
===================================================================
RCS file: /sources/traverso/traverso/src/config.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/config.h 27 Feb 2007 19:50:50 -0000 1.5
+++ src/config.h 15 May 2007 20:06:30 -0000 1.6
@@ -5,16 +5,16 @@
#define PACKAGE_NAME "traverso"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "traverso 0.38.0"
+#define PACKAGE_STRING "traverso 0.40.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "traverso"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.38.0"
+#define PACKAGE_VERSION "0.40.0"
/* traverso resources directory */
#define RESOURCES_DIR "/usr/local/share/traverso/"
/* Version number of package */
-#define VERSION "0.38.0"
+#define VERSION "0.40.0"
Index: src/core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- src/core/AudioClip.cpp 14 May 2007 23:12:16 -0000 1.91
+++ src/core/AudioClip.cpp 15 May 2007 20:06:31 -0000 1.92
@@ -553,8 +553,7 @@
ws->set_process_peaks( true );
ws->set_recording( true );
- connect(ws, SIGNAL(exportFinished( WriteSource* )),
- this, SLOT(finish_write_source( WriteSource* )));
+ connect(ws, SIGNAL(exportFinished(WriteSource*)), this,
SLOT(finish_write_source(WriteSource*)));
writeSources.insert(channelnumber, ws);
m_song->get_diskio()->register_write_source( ws );
@@ -664,17 +663,8 @@
{
PENTER;
-// printf("AudioClip::finish_write_source : thread id is: %ld\n",
QThread::currentThreadId ());
-
- QString dir;
- QString name;
- qint64 id;
-
if (writeSources.contains(ws)) {
writeSources.removeAll(ws);
- dir = ws->get_dir();
- name = ws->get_name();
- id = ws->get_id();
if (ws->m_peak->finish_processing() < 0) {
PERROR("write source peak::finish_processing()
failed!");
}
@@ -687,12 +677,14 @@
if (writeSources.isEmpty()) {
Q_ASSERT(m_readSource);
- printf("finish: id %lld\n", get_id());
if (m_readSource->set_file(m_readSource->get_filename()) < 0) {
PERROR("Setting file for ReadSource failed after
finishing recording");
}
m_song->get_diskio()->register_read_source(m_readSource);
+ // re-inits the lenght from the audiofile due calling
rsm->set_source_for_clip()
+ m_length = 0;
+ resources_manager()->set_source_for_clip(this, m_readSource);
m_recordingStatus = NO_RECORDING;
emit recordingFinished();
@@ -881,10 +873,10 @@
bool ok;
double d = QInputDialog::getDouble(0, tr("Normalization"),
tr("Set Normalization level:"),
0.0, -120, 0, 1, &ok);
- if (ok)
+ if (ok) {
calculate_normalization_factor(d);
+ }
- // Hmm, this is not entirely true, but "almost" ;-)
emit gainChanged();
return (Command*) 0;
@@ -917,11 +909,13 @@
}
if (maxamp == 0.0f) {
+ printf("AudioClip::normalization: max amplitude == 0\n");
/* don't even try */
return;
}
if (maxamp == target) {
+ printf("AudioClip::normalization: max amplitude == target
amplitude\n");
/* we can't do anything useful */
return;
}
Index: src/core/AudioSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioSource.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/core/AudioSource.cpp 11 May 2007 13:09:23 -0000 1.17
+++ src/core/AudioSource.cpp 15 May 2007 20:06:31 -0000 1.18
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: AudioSource.cpp,v 1.17 2007/05/11 13:09:23 r_sijrier Exp $
+$Id: AudioSource.cpp,v 1.18 2007/05/15 20:06:31 r_sijrier Exp $
*/
@@ -164,12 +164,6 @@
return m_origBitDepth;
}
-void AudioSource::set_channel_count( uint count )
-{
- PENTER;
- m_channelCount = count;
-}
-
QString AudioSource::get_short_name() const
{
return m_shortName;
Index: src/core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- src/core/Project.cpp 15 May 2007 17:47:36 -0000 1.43
+++ src/core/Project.cpp 15 May 2007 20:06:31 -0000 1.44
@@ -537,9 +537,9 @@
while(song->render(spec) > 0) {}
- spec->normvalue = 1.0 / spec->peakvalue;
+ spec->normvalue = (1.0 - FLT_EPSILON) / spec->peakvalue;
- if (spec->peakvalue > (1.0 + FLT_EPSILON)) {
+ if (spec->peakvalue > 1.0) {
info().critical(tr("Detected clipping in
exported audio! (%1)")
.arg(coefficient_to_dbstring(spec->peakvalue)));
}
Index: src/traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- src/traverso/Interface.cpp 15 May 2007 17:41:22 -0000 1.81
+++ src/traverso/Interface.cpp 15 May 2007 20:06:31 -0000 1.82
@@ -563,7 +563,7 @@
objects.insert("ProjectManager", pmlist);
- out << "<html><body><h1>Traverso keymap: " <<
config().get_property("CCE", "keymap", "default").toString();
+ out << "<html><body><h1>Traverso keymap: " <<
config().get_property("CCE", "keymap", "default").toString() << "</h1>";
foreach(QList<const QMetaObject* > objectlist, objects.values()) {
QString name = objects.key(objectlist);
@@ -596,7 +596,10 @@
if (i > 0) {
submenuname =
somemenu->menuAction()->text() + "    ";
}
- result +=
QString("<tr><td>") + submenuname + strings.at(1) + "</td><td>" + strings.at(2)
+ "</td></tr>";
+ QString keyfact =
strings.at(2);
+ keyfact.replace("<",
"<");
+
+ result +=
QString("<tr><td>") + submenuname + strings.at(1) + "</td><td>" + keyfact +
"</td></tr>";
}
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso resources/help/quickstartreference.htm...,
Remon Sijrier <=