← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/muse/oneiric

« back to all changes in this revision

Viewing changes to muse/transport.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Fabrice Coutadeur
  • Date: 2010-11-17 21:43:38 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20101117214338-1hvfl7oo2dsqnvrb
Tags: 1.1-0ubuntu1
https://launchpad.net/bugs/668631
* New upstream release (LP: #668631)
* Switch to dpkg-source 3.0 (quilt) format
* Switch to dh7 short form
* debian/rules:
  - added --enable-dssi and --enable-osc to conf flags for dssi support
  - added -ljackserver to LDFLAGS to fix a FTBFS because of --as-needed
* debian/control:
  - added build build dependency on liblo-dev and dssi-dev for dssi support
  - bump Standards-version to 3.9.1. No changes required.
* debian/muse.desktop, debian/muse.xpm: dropped as desktop file and icon is
  now shipped upstream.
* fix-desktop-categories.patch: fix Categories tag in upstream desktop file
* 10_es_locale_fix.dpatch: refreshed and converted to quilt as
  fix_es_locale.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
muse/transport.cpp
16
16
#include <qlayout.h>
17
17
#include <qtoolbutton.h>
18
18
#include <qcombobox.h>
 
19
#include <qaction.h>
19
20
 
20
21
#include "song.h"
21
22
#include "transport.h"
41
42
//---------------------------------------------------------
42
43
 
43
44
static QToolButton* newButton(QWidget* parent, const QString& s,
44
 
   const QString& tt, bool toggle=false)
 
45
   const QString& tt, bool toggle=false, int height=25)
45
46
      {
46
47
      QToolButton* button = new QToolButton(parent);
47
 
      button->setFixedHeight(25);
 
48
      button->setFixedHeight(height);
48
49
      button->setText(s);
49
50
      button->setToggleButton(toggle);
50
51
      QToolTip::add(button, tt);
338
339
      //-----------------------------------------------------
339
340
 
340
341
      QVBox* button1 = new QVBox(this);
341
 
      button1->setMargin(3);
 
342
      button1->setMargin(1);
342
343
 
343
 
      quantizeButton = newButton(button1, tr("AC"), tr("quantize during record"), true);
344
 
      clickButton    = newButton(button1, tr("Click"), tr("metronom click on/off"), true);
 
344
      quantizeButton = newButton(button1, tr("AC"), tr("quantize during record"), true,19);
 
345
      clickButton    = newButton(button1, tr("Click"), tr("metronom click on/off"), true,19);
345
346
      clickButton->setAccel(shortcuts[SHRT_TOGGLE_METRO].key);
346
347
 
347
 
      syncButton     = newButton(button1, tr("Sync"), tr("external sync on/off"), true);
 
348
      syncButton     = newButton(button1, tr("Sync"), tr("external sync on/off"), true,19);
 
349
      jackTransportButton     = newButton(button1, tr("Jack"), tr("Jack transport sync on/off"), true,19);
348
350
 
349
351
      quantizeButton->setOn(song->quantize());
350
352
      clickButton->setOn(song->click());
351
353
      syncButton->setOn(extSyncFlag.value());
 
354
      jackTransportButton->setOn(useJackTransport.value());
352
355
 
353
356
      connect(quantizeButton, SIGNAL(toggled(bool)), song, SLOT(setQuantize(bool)));
354
357
      connect(clickButton, SIGNAL(toggled(bool)), song, SLOT(setClick(bool)));
 
358
 
355
359
      connect(syncButton, SIGNAL(toggled(bool)), &extSyncFlag, SLOT(setValue(bool)));
 
360
      connect(jackTransportButton, SIGNAL(toggled(bool)),&useJackTransport, SLOT(setValue(bool)));
356
361
      connect(&extSyncFlag, SIGNAL(valueChanged(bool)), SLOT(syncChanged(bool)));
 
362
      connect(&useJackTransport, SIGNAL(valueChanged(bool)), SLOT(jackSyncChanged(bool)));
357
363
 
358
364
      connect(song, SIGNAL(quantizeChanged(bool)), this, SLOT(setQuantizeFlag(bool)));
359
365
      connect(song, SIGNAL(clickChanged(bool)), this, SLOT(setClickFlag(bool)));
625
631
      forwardAction->setEnabled(!flag);
626
632
      }
627
633
 
 
634
void Transport::jackSyncChanged(bool flag)
 
635
      {
 
636
      jackTransportButton->setOn(flag);
 
637
      }
628
638
//---------------------------------------------------------
629
639
//   stopToggled
630
640
//---------------------------------------------------------