[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso resources/themes/default/traversotheme...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso resources/themes/default/traversotheme... |
|
Date: |
Mon, 23 Apr 2007 11:56:53 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/04/23 11:56:52
Modified files:
resources/themes/default: traversotheme.xml
src : base.pri
src/plugins : plugins.pro
src/traverso/songcanvas: AudioClipView.cpp songcanvas.pro
src/traverso : traverso.pro
src/traverso/ui: NewProjectDialog.ui
src/traverso/widgets: InfoWidgets.cpp InfoWidgets.h
. : traverso.pro
Log message:
* show real recording time left in status bar when recording.
* updated theme for muted audioclip
* updated build files to link / search for slv2 in local paths
* enabled lv2 support by default since users don't have to compile slv2
themselves anymore
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/base.pri?cvsroot=traverso&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/traverso/src/plugins/plugins.pro?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/songcanvas.pro?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.pro?cvsroot=traverso&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/NewProjectDialog.ui?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.h?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/traverso.pro?cvsroot=traverso&r1=1.6&r2=1.7
Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file:
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- resources/themes/default/traversotheme.xml 21 Apr 2007 15:26:49 -0000
1.18
+++ resources/themes/default/traversotheme.xml 23 Apr 2007 11:56:52 -0000
1.19
@@ -44,12 +44,13 @@
<color name="AudioClip:wavemacroview:outline" red="80"
green="80" blue="120" alpha="255" />
<color name="AudioClip:wavemacroview:outline:curvemode"
red="135" green="130" blue="255" alpha="255" />
<color name="AudioClip:wavemacroview:brush" red="145"
green="145" blue="195" alpha="255" />
+ <color name="AudioClip:wavemacroview:brush:muted" red="185"
green="185" blue="195" alpha="255" />
<color name="AudioClip:wavemacroview:brush:curvemode" red="232"
green="230" blue="255" alpha="255" />
<color name="AudioClip:wavemicroview" red="150" green="150"
blue="205" alpha="255" />
<color name="AudioClip:wavemicroview:curvemode" red="210"
green="210" blue="255" alpha="255" />
- <color name="AudioClip:background:muted" red="40" green="40"
blue="40" alpha="200" />
+ <color name="AudioClip:background:muted" red="230" green="230"
blue="230" alpha="200" />
<color name="AudioClip:background:recording" red="240"
green="240" blue="249" alpha="200" />
- <color name="AudioClip:background:muted:mousehover" red="40"
green="40" blue="40" alpha="200" />
+ <color name="AudioClip:background:muted:mousehover" red="235"
green="235" blue="235" alpha="200" />
<color name="AudioClip:background:selected" red="101"
green="111" blue="171" alpha="200" />
<color name="AudioClip:background:selected:mousehover"
red="101" green="111" blue="171" alpha="200" />
<color name="AudioClip:background" red="246" green="246"
blue="255" alpha="120" />
Index: src/base.pri
===================================================================
RCS file: /sources/traverso/traverso/src/base.pri,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/base.pri 18 Apr 2007 00:08:01 -0000 1.25
+++ src/base.pri 23 Apr 2007 11:56:52 -0000 1.26
@@ -9,8 +9,8 @@
# Choose debug or release build
#
-#CONFIG += debug
-CONFIG += release
+CONFIG += debug
+#CONFIG += release
#
# Add support for Jack / ALSA audio driver. If you have a
@@ -20,7 +20,7 @@
DEFINES += JACK_SUPPORT
DEFINES += ALSA_SUPPORT
#DEFINES += PORTAUDIO_SUPPORT
-#DEFINES += LV2_SUPPORT
+DEFINES += LV2_SUPPORT
DEFINES += STATIC_BUILD
DEFINES += PRECOMPILED_HEADER
Index: src/plugins/plugins.pro
===================================================================
RCS file: /sources/traverso/traverso/src/plugins/plugins.pro,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/plugins/plugins.pro 2 Apr 2007 09:52:31 -0000 1.9
+++ src/plugins/plugins.pro 23 Apr 2007 11:56:52 -0000 1.10
@@ -5,11 +5,13 @@
DESTDIR = ../../lib
TEMPLATE = lib
-INCLUDEPATH += ../core \
+INCLUDEPATH += \
+ ../core \
../engine \
../commands \
LV2 \
native \
+ ../3rdparty/slv2
SOURCES += PluginChain.cpp \
Plugin.cpp \
Index: src/traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- src/traverso/songcanvas/AudioClipView.cpp 20 Apr 2007 13:22:21 -0000
1.47
+++ src/traverso/songcanvas/AudioClipView.cpp 23 Apr 2007 11:56:52 -0000
1.48
@@ -211,7 +211,7 @@
// when painting with a path, I _have_ to use path.lineTo()
// which looks ugly when only parts of the clip is repainted
// when using a different color for the brush then the outline.
- // Painting one more pixel makes it getting clipped away.....
+ // Painting 2 more pixels makes it getting clipped away.....
pixelcount += 2;
// Seems like we need one pixel more to the left as well, to
// make the outline painting painted correctly...
@@ -420,6 +420,10 @@
p->setBrush(themer()->get_color("AudioClip:wavemacroview:brush:curvemode"));
}
}
+ if (m_clip->is_muted()) {
+
p->setBrush(themer()->get_color("AudioClip:wavemacroview:brush:muted"));
+ }
+
QPainterPath path;
// in rectified view, we add an additional point, hence
+ 1
Index: src/traverso/songcanvas/songcanvas.pro
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/songcanvas.pro,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/traverso/songcanvas/songcanvas.pro 2 Apr 2007 09:52:31 -0000
1.2
+++ src/traverso/songcanvas/songcanvas.pro 23 Apr 2007 11:56:52 -0000
1.3
@@ -11,7 +11,6 @@
../../engine \
../../commands \
../../plugins \
- ../../plugins/LV2 \
./
SOURCES += AudioClipView.cpp \
@@ -67,8 +66,10 @@
../ui/ProjectManagerDialog.ui
-!contains(DEFINES, LV2_SUPPORT){
- INCLUDEPATH -= ../plugins/LV2
+contains(DEFINES, LV2_SUPPORT){
+INCLUDEPATH += \
+ ../../plugins/LV2 \
+ ../../3rdparty/slv2
}
QT += opengl
Index: src/traverso/traverso.pro
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.pro,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- src/traverso/traverso.pro 17 Apr 2007 11:51:20 -0000 1.44
+++ src/traverso/traverso.pro 23 Apr 2007 11:56:52 -0000 1.45
@@ -21,7 +21,6 @@
-ltraversoplugins \
-lsndfile \
-lsamplerate \
- -lslv2 \
-lfftw3 \
HEADERS += \
@@ -129,9 +128,9 @@
contains(DEFINES, JACK_SUPPORT): LIBS += -ljack
-!contains(DEFINES, LV2_SUPPORT){
- LIBS -= -lslv2
- INCLUDEPATH -= ../plugins/LV2
+contains(DEFINES, LV2_SUPPORT){
+ LIBS += -lrdf -lrasqal -lslv2
+ INCLUDEPATH += ../3rdparty/slv2 ../plugins/LV2
}
QT += opengl
Index: src/traverso/ui/NewProjectDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/NewProjectDialog.ui,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/traverso/ui/NewProjectDialog.ui 4 Apr 2007 00:07:14 -0000 1.1
+++ src/traverso/ui/NewProjectDialog.ui 23 Apr 2007 11:56:52 -0000 1.2
@@ -100,7 +100,7 @@
<property name="maximumSize" >
<size>
<width>16777215</width>
- <height>30</height>
+ <height>50</height>
</size>
</property>
</widget>
Index: src/traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/traverso/widgets/InfoWidgets.cpp 19 Apr 2007 12:54:04 -0000
1.16
+++ src/traverso/widgets/InfoWidgets.cpp 23 Apr 2007 11:56:52 -0000
1.17
@@ -33,10 +33,9 @@
#include <QPixmap>
#include <QByteArray>
#include <QDesktopWidget>
+#include <QPalette>
-#if HAVE_SYS_VFS_H
#include <sys/vfs.h>
-#endif
// Always put me below _all_ includes, this is needed
@@ -254,44 +253,70 @@
void HDDSpaceInfo::song_started()
{
- updateTimer.start(3000);
+ updateTimer.start(5000);
m_button->setEnabled(true);
+ update_status();
}
void HDDSpaceInfo::song_stopped()
{
- updateTimer.start(20000);
+ updateTimer.start(30000);
m_button->setEnabled(false);
+ update_status();
}
void HDDSpaceInfo::update_status( )
{
-#if HAVE_SYS_VFS_H
- Project* project = pm().get_project();
-
- if (!project) {
+ if (!m_project) {
m_button->setText("No Info");
return;
}
struct statfs fs;
- statfs(project->get_root_dir().toAscii().data(), &fs);
+ statfs(QS_C(m_project->get_root_dir()), &fs);
double space = floor (fs.f_bavail * (fs.f_bsize / 1048576.0));
- QString s;
+ QList<Song*> recordingSongs;
+ foreach(Song* song, m_project->get_songs()) {
+ if (song->is_recording() && song->any_track_armed()) {
+ recordingSongs.append(song);
+ }
+ }
+
+ QString text;
+
+ if (recordingSongs.size()) {
+ int recChannelCount = 0;
+ foreach(Song* song, recordingSongs) {
+ foreach(Track* track, song->get_tracks()) {
+ if (track->armed()) {
+ recChannelCount +=
track->capture_left_channel() ? 1 : 0;
+ recChannelCount +=
track->capture_right_channel() ? 1 : 0;
+ }
+ }
+ }
+
+ uint rate = audiodevice().get_sample_rate();
+ double frames = ( (space * 1048576) / (sizeof(float) *
recChannelCount));
+ text = frame_to_hms(frames, rate);
+ if (text < "00:30:00") {
+ QPalette pal;
+ pal.setColor(QPalette::ButtonText, QColor(Qt::red));
+ m_button->setPalette(pal);
+ }
+ } else {
if (space > 9216) {
- s.setNum((space/1024), 'f', 2);
- s.append(" GB");
+ text.setNum((space/1024), 'f', 2);
+ text.append(" GB");
} else {
- s.setNum(space, 'f', 0);
- s.append(" MB");
+ text.setNum(space, 'f', 0);
+ text.append(" MB");
+ }
}
- m_button->setText(s);
-
-#endif
+ m_button->setText(text);
}
QSize HDDSpaceInfo::sizeHint() const
@@ -385,6 +410,7 @@
setAutoFillBackground(false);
setToolTip(tr("Start/stop playback. You should use the SpaceBar! ;-)"));
setMinimumWidth(110);
+ create_background();
connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(update()));
}
@@ -442,7 +468,7 @@
painter.setFont(QFont("Bitstream Vera Sans", 13));
painter.setPen(fontcolor);
- painter.fillRect(0, 0, width(), height(), QColor(247, 246, 255));
+ painter.drawPixmap(0, 0, m_background);
painter.drawPixmap(8, 6, m_playpixmap);
painter.drawText(QRect(12, 4, width() - 6, height() - 6),
Qt::AlignCenter, currentsmpte);
}
@@ -465,6 +491,24 @@
return QSize(120, INFOBAR_HEIGH_HOR_ORIENTATION);
}
+void PlayHeadInfo::resizeEvent(QResizeEvent * e)
+{
+ create_background();
+}
+
+
+void PlayHeadInfo::create_background()
+{
+ m_background = QPixmap(size());
+ QPainter painter(&m_background);
+ painter.setRenderHints(QPainter::Antialiasing);
+ m_background.fill(palette().background().color());
+ int round = 12;
+ painter.setPen(QColor(50, 50, 50));
+ painter.setBrush(QColor(250, 251, 255));
+ painter.drawRoundRect(m_background.rect(), round, round);
+}
+
void PlayHeadInfo::mousePressEvent(QMouseEvent * event)
{
if (! m_song) {
@@ -818,3 +862,4 @@
}
//eof
+
Index: src/traverso/widgets/InfoWidgets.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/traverso/widgets/InfoWidgets.h 12 Apr 2007 13:39:12 -0000 1.10
+++ src/traverso/widgets/InfoWidgets.h 23 Apr 2007 11:56:52 -0000 1.11
@@ -171,11 +171,15 @@
protected:
void mousePressEvent ( QMouseEvent * event );
void paintEvent( QPaintEvent* e);
+ void resizeEvent( QResizeEvent * e );
QSize sizeHint() const;
private:
QTimer m_updateTimer;
QPixmap m_playpixmap;
+ QPixmap m_background;
+
+ void create_background();
protected slots:
void set_project(Project* );
Index: traverso.pro
===================================================================
RCS file: /sources/traverso/traverso/traverso.pro,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- traverso.pro 15 Mar 2007 23:42:36 -0000 1.6
+++ traverso.pro 23 Apr 2007 11:56:52 -0000 1.7
@@ -13,6 +13,7 @@
src/traverso/songcanvas \
src/commands/plugins/TraversoCommands \
src/traverso \
+ src/3rdparty/slv2
DISTFILES += \
ChangeLog \