[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src core/ReadSource.cpp traverso/Trave...
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src core/ReadSource.cpp traverso/Trave... |
Date: |
Tue, 01 May 2007 21:11:42 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/05/01 21:11:42
Modified files:
src/core : ReadSource.cpp
src/traverso : Traverso.cpp Traverso.h
src/traverso/widgets: ResourcesWidget.cpp
Log message:
* Delete MonoSource if init() failed.
* Create interface AFTER the QApplication event loop has been started.
Solves some weird issues with Windows...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.cpp?cvsroot=traverso&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Traverso.cpp?cvsroot=traverso&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Traverso.h?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.cpp?cvsroot=traverso&r1=1.5&r2=1.6
Patches:
Index: core/ReadSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- core/ReadSource.cpp 30 Apr 2007 13:49:59 -0000 1.23
+++ core/ReadSource.cpp 1 May 2007 21:11:42 -0000 1.24
@@ -146,16 +146,19 @@
int ReadSource::add_mono_reader(int sourceChannelCount, int channelNumber,
const QString& fileName)
{
+ int result = 1;
+
MonoReader* source = new MonoReader(this, sourceChannelCount,
channelNumber, fileName);
- if (source->init() > 0) {
+ if ( (result = source->init()) > 0) {
m_sources.append(source);
} else {
PERROR("Failed to initialize a MonoReader (%s)",
QS_C(fileName));
- return -1;
+ delete source;
+ return result;
}
- return 1;
+ return result;
}
int ReadSource::file_read (int channel, audio_sample_t* dst, nframes_t start,
nframes_t cnt) const
Index: traverso/Traverso.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Traverso.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- traverso/Traverso.cpp 24 Apr 2007 23:28:42 -0000 1.39
+++ traverso/Traverso.cpp 1 May 2007 21:11:42 -0000 1.40
@@ -97,11 +97,9 @@
init_sse();
- create_interface();
-
prepare_audio_device();
- QMetaObject::invokeMethod(&pm(), "start", Qt::QueuedConnection);
+ QMetaObject::invokeMethod(this, "create_interface",
Qt::QueuedConnection);
connect(this, SIGNAL(lastWindowClosed()), &pm(), SLOT(exit()));
}
@@ -120,6 +118,7 @@
themer()->load();
Interface* iface = Interface::instance();
iface->show();
+ pm().start();
}
void Traverso::shutdown( int signal )
Index: traverso/Traverso.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Traverso.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- traverso/Traverso.h 16 Mar 2007 00:10:26 -0000 1.8
+++ traverso/Traverso.h 1 May 2007 21:11:42 -0000 1.9
@@ -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: Traverso.h,v 1.8 2007/03/16 00:10:26 r_sijrier Exp $
+ $Id: Traverso.h,v 1.9 2007/05/01 21:11:42 r_sijrier Exp $
*/
#ifndef Traverso_H
@@ -28,6 +28,7 @@
class Traverso : public QApplication
{
+ Q_OBJECT
public :
@@ -44,6 +45,8 @@
private :
void init_sse();
void prepare_audio_device();
+
+private slots:
void create_interface();
};
Index: traverso/widgets/ResourcesWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- traverso/widgets/ResourcesWidget.cpp 30 Apr 2007 17:50:17 -0000
1.5
+++ traverso/widgets/ResourcesWidget.cpp 1 May 2007 21:11:42 -0000
1.6
@@ -39,8 +39,7 @@
: QWidget(parent)
{
setupUi(this);
-/* audioFileTreeWidget->hide();
- clipTreeWidget->show();*/
+
QPalette palette;
palette.setColor(QPalette::AlternateBase,
themer()->get_color("Track:background"));
clipTreeWidget->setPalette(palette);
@@ -71,6 +70,8 @@
m_dirView->setDragEnabled(true);
m_dirView->setDropIndicatorShown(true);
m_dirView->setSelectionMode(QAbstractItemView::ExtendedSelection);
+ m_dirView->setAlternatingRowColors(true);
+ m_dirView->setPalette(palette);
m_dirModel->setSorting(QDir::DirsFirst | QDir::Name | QDir::IgnoreCase);
layout()->addWidget(m_dirView);
m_dirView->hide();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src core/ReadSource.cpp traverso/Trave...,
Remon Sijrier <=