Commit c90eecea authored by jcaceres's avatar jcaceres
Browse files

modifications to remove stripchart from jacktrip

parent b8082ef9
......@@ -12,15 +12,16 @@
#include "ThreadCommEvent.h"
#include <qlabel.h>
#include <qlayout.h>
#include <qwt_slider.h>
//#include <qwt_slider.h> //Removed for compatibility with qwt-5 (we are not really using it right now)
MainDialog::MainDialog (QWidget * parent, const char *name):
MainWindow (parent, name) // generated by designer
{
plot = new StripChart (plotFrame);
// plot = new StripChart (plotFrame);
// plot->setAxisScale(0,0.0,0.1);
// plot->setAxisScale(1,0.0,0.1);
plot->resize (300, 300);
// plot->resize (300, 300);
connect ((QObject *) goButton, SIGNAL (toggled (bool)),
SLOT (goThreads (bool)));
......@@ -28,9 +29,10 @@ connect ((QObject *) goButton, SIGNAL (toggled (bool)),
}
void
MainDialog::init(StreamBD *s)
{
MainDialog::init(StreamBD *s){
QString tmp;
QTextOStream (&tmp) << "sampleRate " << s->args->sampleRate;
sampleRateTextLabel->setText (tmp); tmp = "";
......@@ -125,8 +127,8 @@ MainDialog::customEvent (QCustomEvent * e)
if (e->type () == QEvent::User + 117)
{
ThreadCommEvent *ce = (ThreadCommEvent *) e;
if (ce->val0 () > 0.0) plot->setV1 (ce->val0 ());
if (ce->val0 () > 0.0) plot->dpy();
if (ce->val1 () > 0.0) plot->setV2 (ce->val1 ());
// if (ce->val0 () > 0.0) plot->setV1 (ce->val0 ());
// if (ce->val0 () > 0.0) plot->dpy();
// if (ce->val1 () > 0.0) plot->setV2 (ce->val1 ());
}
}
......@@ -12,7 +12,7 @@
#include "qstring.h"
#include "qtimer.h"
#include "StreamBD.h"
#include "StripChart.h"
//#include "StripChart.h" //Removed for compatibility with qwt-5 (we are not really using it right now)
class MainDialog:public MainWindow
{
......@@ -20,7 +20,7 @@ class MainDialog:public MainWindow
MainDialog (QWidget * parent = 0, const char *name = 0);
virtual ~ MainDialog ();
void init(StreamBD *s);
StripChart *plot;
//StripChart *plot; //Removed for compatibility with qwt-5 (we are not really using it right now)
virtual void closeEvent (QCloseEvent * e);
void customEvent (QCustomEvent * e);
void addThread (QObject * t);
......
......@@ -301,10 +301,8 @@ void
StreamBD::PrintUsage ()
{
cout << "===========================================================================" << endl;
cout << " streamBD A project of the SoundWIRE group at CCRMA, Stanford." << endl;
cout << " http://www-ccrma.stanford.edu/groups/soundwire/" << endl << endl;
cout << " Programming: Daniel Walling (dwalling@ccrma.stanford.edu)" << endl;
cout << " Based on code by Scott Wilson (rswilson@ccrma.stanford.edu)" << endl;
cout << " jacktrip A project of the SoundWIRE group at CCRMA, Stanford." << endl;
cout << " http://ccrma.stanford.edu/groups/soundwire/software/" << endl << endl;
cout << "===========================================================================" << endl;
cout << " Needs to be run in one of the following modes:" << endl;
cout << " -r Receiver (opens audio channels and waits" << endl;
......@@ -338,9 +336,8 @@ StreamBD::PrintUsage ()
cout << " -J jack alsa readable offset (" << args->jack_alsa_readable_offset << ")" << endl;
cout << " -g gui (" << args->gui << ")" << endl;
cout << endl;
cout << " run 'src/streambd' to see these instructions." <<
cout << " run 'src/jacktrip' to see these instructions." <<
endl;
cout << " Look in INSTRUCTIONS.TXT for further help." << endl;
}
/**
......
......@@ -26,7 +26,7 @@ echo "qmake .pro built"
qmake -makefile -unix -o Makefile \
"CONFIG+=qt thread warn_on debug" \
"QMAKE_CXXFLAGS+=-Wno-deprecated -pg -g" \
"INCLUDEPATH+=/usr/include/stk ../include $QTDIR/include/qwt" \
"INCLUDEPATH+=/usr/include/stk $QTDIR/include/qwt" \
"DEFINES+=__LINUX_ALSA__ APP_NAME=$APP_NAME_QUOTES" \
"QMAKE_CLEAN+=$APP_NAME" \
"unix:LIBS+=-Xlinker -rpath $QTDIR/lib -lstk -lasound -ljack -lqwt" \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment