[Lmuse-cvs-traffic] muse/muse/widgets metronome.cpp, 1.2, 1.2.2.1 metronome.h, 1.1.1.1, 1.1.1.1.2.1 metronomebase.ui, 1.1.1.1.2.2, 1.1.1.1.2.3

[terminator356 <ter...@us...>]

Update of /cvsroot/lmuse/muse/muse/widgets
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9740/muse/widgets

Modified Files:
      Tag: REL07
	metronome.cpp metronome.h metronomebase.ui 
Log Message:
See ChangeLog

Index: metronome.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/Attic/metronome.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** metronome.cpp	16 Jan 2004 00:43:07 -0000	1.2
--- metronome.cpp	20 Dec 2009 05:00:35 -0000	1.2.2.1
***************
*** 9,16 ****
--- 9,20 ----
  #include <stdio.h>
  #include "metronome.h"
+ #include <qt.h>
  #include <qpushbutton.h>
  #include <qspinbox.h>
  #include <qcheckbox.h>
  #include "globals.h"
+ #include "song.h"
+ #include "track.h"
+ #include "audio.h"
  
  //---------------------------------------------------------
***************
*** 26,30 ****
        connect(precountFromMastertrack, SIGNAL(toggled(bool)),
           SLOT(precountFromMastertrackChanged(bool)));
! 
        measureNote->setValue(measureClickNote);
        measureVelocity->setValue(measureClickVelo);
--- 30,35 ----
        connect(precountFromMastertrack, SIGNAL(toggled(bool)),
           SLOT(precountFromMastertrackChanged(bool)));
!       connect(audioBeepRoutesButton, SIGNAL(clicked()), SLOT(audioBeepRoutesClicked()));
!       
        measureNote->setValue(measureClickNote);
        measureVelocity->setValue(measureClickVelo);
***************
*** 45,48 ****
--- 50,100 ----
  
  //---------------------------------------------------------
+ //   audioBeepRoutesClicked
+ //---------------------------------------------------------
+ 
+ void MetronomeConfig::audioBeepRoutesClicked()
+ {
+       if(song->outputs()->size() == 0)
+         return;
+         
+       //QPopupMenu* pup = new QPopupMenu(audioBeepRoutesButton);
+       QPopupMenu* pup = new QPopupMenu(this);
+       pup->setCheckable(true);
+       
+       OutputList* ol = song->outputs();
+ 
+       int nn = 0;
+       for(iAudioOutput iao = ol->begin(); iao != ol->end(); ++iao)
+       {
+         int id = pup->insertItem(QT_TR_NOOP((*iao)->name()), nn);
+         if((*iao)->sendMetronome())
+           pup->setItemChecked(id, true);
+         ++nn;  
+       }  
+       
+       int n = pup->exec(QCursor::pos());
+       if(n != -1) 
+       {
+         //QString s(pup->text(n));
+         nn = 0;
+         for(iAudioOutput iao = ol->begin(); iao != ol->end(); ++iao)
+         {
+           //if(((*iao)->name() == s) && (n == nn))
+           if(n == nn)
+           {
+             //(*iao)->setSendMetronome();
+             audio->msgSetSendMetronome(*iao, !pup->isItemChecked(n));
+             //song->update(SC_ROUTE);
+             break;
+           }
+           ++nn;
+         }  
+       }
+       
+       delete pup;
+       audioBeepRoutesButton->setDown(false);     // pup->exec() catches mouse release event
+ }
+ 
+ //---------------------------------------------------------
  //   accept
  //---------------------------------------------------------

Index: metronomebase.ui
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/Attic/metronomebase.ui,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -d -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** metronomebase.ui	16 Jan 2005 12:47:09 -0000	1.1.1.1.2.2
--- metronomebase.ui	20 Dec 2009 05:00:35 -0000	1.1.1.1.2.3
***************
*** 60,70 ****
                              <number>6</number>
                          </property>
!                         <widget class="QCheckBox">
!                             <property name="name">
!                                 <cstring>audioBeep</cstring>
!                             </property>
!                             <property name="text">
!                                 <string>Audio Beep</string>
!                             </property>
                          </widget>
                          <widget class="QCheckBox">
--- 60,88 ----
                              <number>6</number>
                          </property>
!                         <widget class="QLayoutWidget">
!                           <property name="name">
!                             <cstring>audioBeepLayout</cstring>
!                           </property>
!                           <hbox>
!                             <widget class="QCheckBox">
!                                 <property name="name">
!                                     <cstring>audioBeep</cstring>
!                                 </property>
!                                 <property name="text">
!                                     <string>Audio Beep</string>
!                                 </property>
!                             </widget>
!                             <widget class="QPushButton">
!                               <property name="name">
!                                 <cstring>audioBeepRoutesButton</cstring>
!                               </property>
!                               <property name="text">
!                                 <string>Choose outputs...</string>
!                               </property>
!                               <property name="autoDefault">
!                                 <bool>true</bool>
!                               </property>
!                             </widget>
!                           </hbox>
                          </widget>
                          <widget class="QCheckBox">
***************
*** 482,485 ****
--- 500,504 ----
  <tabstops>
      <tabstop>audioBeep</tabstop>
+     <tabstop>audioBeepRoutesButton</tabstop>
      <tabstop>midiClick</tabstop>
      <tabstop>measureNote</tabstop>

Index: metronome.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/Attic/metronome.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** metronome.h	27 Oct 2003 18:54:37 -0000	1.1.1.1
--- metronome.h	20 Dec 2009 05:00:35 -0000	1.1.1.1.2.1
***************
*** 23,26 ****
--- 23,27 ----
        void apply();
        virtual void reject();
+       virtual void audioBeepRoutesClicked();
        void midiClickChanged(bool);
        void precountEnableChanged(bool);