View | Details | Raw Unified
Collapse All | Expand All

(-) muse-0.6.2/app.cpp (-28 / +28 lines)
 Lines 1190-1196    Link Here 
            song->setName(project.baseName());
            song->setName(project.baseName());
      setCaption(QString("MusE: Song: ") + project.baseName());
      setCaption(QString("MusE: Song: ") + project.baseName());
      arranger->reset();
      arranger->reset();
      arranger->setMode(int(song->mtype()));
      arranger->setMode(long(song->mtype()));
      newSongFlag = true;
      newSongFlag = true;
      song->dirty = false;
      song->dirty = false;
 Lines 1257-1264    Link Here 
      {
      {
      PianoRoll* pianoroll = new PianoRoll(pl, this);
      PianoRoll* pianoroll = new PianoRoll(pl, this);
      pianoroll->show();
      pianoroll->show();
      toplevels.push_back(Toplevel(Toplevel::PIANO_ROLL, int(pianoroll), pianoroll));
      toplevels.push_back(Toplevel( Toplevel::PIANO_ROLL, pianoroll, pianoroll));
      connect(pianoroll, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
      connect(pianoroll, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(void*)));
      }
      }
//---------------------------------------------------------
//---------------------------------------------------------
 Lines 1277-1284    Link Here 
      {
      {
      Score* scoreEditor = new Score(pl);
      Score* scoreEditor = new Score(pl);
      scoreEditor->show();
      scoreEditor->show();
      toplevels.push_back(Toplevel(Toplevel::NOTEN, int(scoreEditor), scoreEditor));
      toplevels.push_back(Toplevel(Toplevel::NOTEN, scoreEditor, scoreEditor));
      connect(scoreEditor, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
      connect(scoreEditor, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(void*)));
      }
      }
//---------------------------------------------------------
//---------------------------------------------------------
 Lines 1297-1304    Link Here 
      {
      {
      ListEdit* listEditor = new ListEdit(pl);
      ListEdit* listEditor = new ListEdit(pl);
      listEditor->show();
      listEditor->show();
      toplevels.push_back(Toplevel(Toplevel::LISTE, int(listEditor), listEditor));
      toplevels.push_back(Toplevel(Toplevel::LISTE, listEditor, listEditor));
      connect(listEditor, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
      connect(listEditor, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(void*)));
      }
      }
//---------------------------------------------------------
//---------------------------------------------------------
 Lines 1309-1316    Link Here 
      {
      {
      MasterEdit* masterEditor = new MasterEdit();
      MasterEdit* masterEditor = new MasterEdit();
      masterEditor->show();
      masterEditor->show();
      toplevels.push_back(Toplevel(Toplevel::MASTER, int(masterEditor), masterEditor));
      toplevels.push_back(Toplevel(Toplevel::MASTER, masterEditor, masterEditor));
      connect(masterEditor, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
      connect(masterEditor, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(void*)));
      }
      }
//---------------------------------------------------------
//---------------------------------------------------------
 Lines 1321-1328    Link Here 
      {
      {
      LMaster* lmaster = new LMaster();
      LMaster* lmaster = new LMaster();
      lmaster->show();
      lmaster->show();
      toplevels.push_back(Toplevel(Toplevel::LMASTER, int(lmaster), lmaster));
      toplevels.push_back(Toplevel(Toplevel::LMASTER, lmaster, lmaster));
      connect(lmaster, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
      connect(lmaster, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(void*)));
      }
      }
//---------------------------------------------------------
//---------------------------------------------------------
 Lines 1341-1348    Link Here 
      {
      {
      DrumEdit* drumEditor = new DrumEdit(pl, this);
      DrumEdit* drumEditor = new DrumEdit(pl, this);
      drumEditor->show();
      drumEditor->show();
      toplevels.push_back(Toplevel(Toplevel::DRUM, int(drumEditor), drumEditor));
      toplevels.push_back(Toplevel(Toplevel::DRUM, drumEditor, drumEditor));
      connect(drumEditor, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
      connect(drumEditor, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(void*)));
      }
      }
//---------------------------------------------------------
//---------------------------------------------------------
 Lines 1363-1370    Link Here 
      {
      {
      WaveEdit* waveEditor = new WaveEdit(pl);
      WaveEdit* waveEditor = new WaveEdit(pl);
      waveEditor->show();
      waveEditor->show();
      toplevels.push_back(Toplevel(Toplevel::WAVE, int(waveEditor), waveEditor));
      toplevels.push_back(Toplevel(Toplevel::WAVE, waveEditor, waveEditor));
      connect(waveEditor, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
      connect(waveEditor, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(void*)));
      }
      }
//---------------------------------------------------------
//---------------------------------------------------------
 Lines 1375-1384    Link Here 
      {
      {
      if (midiMixer == 0) {
      if (midiMixer == 0) {
            midiMixer = new Mixer();
            midiMixer = new Mixer();
            toplevels.push_back(Toplevel(Toplevel::M_MIXER, int(midiMixer), midiMixer));
            toplevels.push_back(Toplevel(Toplevel::M_MIXER, midiMixer, midiMixer));
            connect(midiMixer, SIGNAL(ctrlChanged(int,int,int,int)), song, SLOT(ctrlChanged(int,int,int,int)));
            connect(midiMixer, SIGNAL(ctrlChanged(int,int,int,int)), song, SLOT(ctrlChanged(int,int,int,int)));
            connect(midiMixer, SIGNAL(masterVolChanged(int)), song, SLOT(masterVolChanged(int)));
            connect(midiMixer, SIGNAL(masterVolChanged(int)), song, SLOT(masterVolChanged(int)));
            connect(midiMixer, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
            connect(midiMixer, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(void*)));
            }
            }
      midiMixer->show();
      midiMixer->show();
      menu_functions->setItemChecked(midid1, true);
      menu_functions->setItemChecked(midid1, true);
 Lines 1401-1408    Link Here 
      {
      {
      if (markerView == 0) {
      if (markerView == 0) {
            markerView = new MarkerView(this);
            markerView = new MarkerView(this);
            toplevels.push_back(Toplevel(Toplevel::MARKER, int(markerView), markerView));
            toplevels.push_back(Toplevel(Toplevel::MARKER, markerView, markerView));
//            connect(markerView, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
//            connect(markerView, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(void*)));
            }
            }
      markerView->show();
      markerView->show();
      }
      }
 Lines 1415-1422    Link Here 
      {
      {
      if (audioMixer == 0) {
      if (audioMixer == 0) {
            audioMixer = new AudioMixerApp();
            audioMixer = new AudioMixerApp();
            toplevels.push_back(Toplevel(Toplevel::A_MIXER, int(audioMixer), audioMixer));
            toplevels.push_back(Toplevel(Toplevel::A_MIXER, audioMixer, audioMixer));
            connect(audioMixer, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
            connect(audioMixer, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(void*)));
            }
            }
      audioMixer->show();
      audioMixer->show();
      menu_audio->setItemChecked(aid1, true);
      menu_audio->setItemChecked(aid1, true);
 Lines 1430-1437    Link Here 
      {
      {
      if (clipListEdit == 0) {
      if (clipListEdit == 0) {
            clipListEdit = new ClipListEdit();
            clipListEdit = new ClipListEdit();
            toplevels.push_back(Toplevel(Toplevel::CLIPLIST, int(clipListEdit), clipListEdit));
            toplevels.push_back(Toplevel(Toplevel::CLIPLIST, clipListEdit, clipListEdit));
            connect(clipListEdit, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
            connect(clipListEdit, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(void*)));
            }
            }
      clipListEdit->show();
      clipListEdit->show();
      menu_audio->setItemChecked(aid2, true);
      menu_audio->setItemChecked(aid2, true);
 Lines 1476-1485    Link Here 
//   toplevelDeleted
//   toplevelDeleted
//---------------------------------------------------------
//---------------------------------------------------------
void MusE::toplevelDeleted(int tl)
void MusE::toplevelDeleted(void* tl)
      {
      {
      for (iToplevel i = toplevels.begin(); i != toplevels.end(); ++i) {
      for (iToplevel i = toplevels.begin(); i != toplevels.end(); ++i) {
            if (i->object() == tl) {
            if ( i->object() == tl ) {
                  switch(i->type()) {
                  switch(i->type()) {
                        case Toplevel::M_MIXER:
                        case Toplevel::M_MIXER:
                              menu_functions->setItemChecked(midid1, false);
                              menu_functions->setItemChecked(midid1, false);
 Lines 2156-2162    Link Here 
            Toplevel tl = *i;
            Toplevel tl = *i;
            if (tl.type() == Toplevel::WAVE) {
            if (tl.type() == Toplevel::WAVE) {
                  TopWin* obj = tl.cobject();
                  TopWin* obj = tl.cobject();
                  ((WaveEdit*)(obj))->setBg(WaveEdit::configBg());
                  reinterpret_cast<WaveEdit*>(obj)->setBg(WaveEdit::configBg());
                  }
                  }
            }
            }
      }
      }
 Lines 2593-2599    Link Here 
again:
again:
      for (iToplevel i = toplevels.begin(); i != toplevels.end(); ++i) {
      for (iToplevel i = toplevels.begin(); i != toplevels.end(); ++i) {
            Toplevel tl = *i;
            Toplevel tl = *i;
            int obj = tl.object();
            void* obj = tl.object();
            switch (tl.type()) {
            switch (tl.type()) {
                  case Toplevel::A_MIXER:
                  case Toplevel::A_MIXER:
                        delete audioMixer;
                        delete audioMixer;
 Lines 2611-2617    Link Here 
                  case Toplevel::WAVE:
                  case Toplevel::WAVE:
                  case Toplevel::LMASTER:
                  case Toplevel::LMASTER:
                  case Toplevel::MIXDOWN:
                  case Toplevel::MIXDOWN:
                        ((QWidget*)(obj))->close(true);
                        reinterpret_cast<QWidget*>(obj)->close(true);
                        goto again;
                        goto again;
                  }
                  }
            }
            }
(-) muse-0.6.2/app.h (-1 / +1 lines)
 Lines 227-233    Link Here 
      void ctrlChanged();
      void ctrlChanged();
      void loadProjectFile(const QString&);
      void loadProjectFile(const QString&);
      void startAudioMixer();
      void startAudioMixer();
      void toplevelDeleted(int tl);
      void toplevelDeleted(void* tl);
      void loadTheme(QString);
      void loadTheme(QString);
      void setTransportHandleColor(QColor);
      void setTransportHandleColor(QColor);
      void setBigTimeForegroundColor(QColor);
      void setBigTimeForegroundColor(QColor);
(-) muse-0.6.2/cliplist/cliplist.cpp (-1 / +1 lines)
 Lines 184-190    Link Here 
void ClipListEdit::closeEvent(QCloseEvent* e)
void ClipListEdit::closeEvent(QCloseEvent* e)
      {
      {
      emit deleted((int)this);
      emit deleted(this);
      e->accept();
      e->accept();
      }
      }
(-) muse-0.6.2/cliplist/cliplist.h (-1 / +1 lines)
 Lines 37-43    Link Here 
      void clicked(QListViewItem*);
      void clicked(QListViewItem*);
   signals:
   signals:
      void deleted(int);
      void deleted(void*);
   public:
   public:
      ClipListEdit();
      ClipListEdit();
(-) muse-0.6.2/cobject.h (-7 / +5 lines)
 Lines 44-61    Link Here 
         , M_PATCHBAY
         , M_PATCHBAY
#endif /* PATCHBAY */
#endif /* PATCHBAY */
         };
         };
      Toplevel(ToplevelType t, int obj, TopWin* cobj) {
	  // Rethink that : saving void*_object ( formerly int) and TopWin* _cobject makes no sense!
            _type = t;
      Toplevel(ToplevelType t, void * obj, TopWin* cobj)
            _object = obj;
	  : _type(t), _object(obj), _cobject(cobj){ }
            _cobject = cobj;
            }
      ToplevelType type() const { return _type; }
      ToplevelType type() const { return _type; }
      int object()        const { return _object; }
      void* object()        const { return _object; }
      TopWin* cobject()   const { return _cobject; }
      TopWin* cobject()   const { return _cobject; }
   private:
   private:
      ToplevelType _type;
      ToplevelType _type;
      int _object;
      void* _object;
      TopWin* _cobject;
      TopWin* _cobject;
      };
      };
(-) muse-0.6.2/liste/listedit.cpp (-1 / +1 lines)
 Lines 139-145    Link Here 
void ListEdit::closeEvent(QCloseEvent* e)
void ListEdit::closeEvent(QCloseEvent* e)
      {
      {
      emit deleted((int)this);
      emit deleted(this);
      e->accept();
      e->accept();
      }
      }
(-) muse-0.6.2/liste/listedit.h (-1 / +1 lines)
 Lines 58-64    Link Here 
      void songChanged(int);
      void songChanged(int);
   signals:
   signals:
      void deleted(int);
      void deleted(void*);
   public:
   public:
      ListEdit(PartList*);
      ListEdit(PartList*);
(-) muse-0.6.2/marker/markerview.cpp (-1 / +1 lines)
 Lines 136-142    Link Here 
void MarkerView::closeEvent(QCloseEvent* e)
void MarkerView::closeEvent(QCloseEvent* e)
      {
      {
      emit deleted((int)this);
      emit deleted(this);
      e->accept();
      e->accept();
      }
      }
(-) muse-0.6.2/marker/markerview.h (-1 / +1 lines)
 Lines 67-73    Link Here 
      void songChanged(int);
      void songChanged(int);
   signals:
   signals:
      void deleted(int);
      void deleted(void*);
   public:
   public:
      MarkerView(QWidget* parent);
      MarkerView(QWidget* parent);
(-) muse-0.6.2/master/lmaster.cpp (-1 / +1 lines)
 Lines 26-32    Link Here 
void LMaster::closeEvent(QCloseEvent* e)
void LMaster::closeEvent(QCloseEvent* e)
      {
      {
      emit deleted((int)this);
      emit deleted(this);
      e->accept();
      e->accept();
      }
      }
(-) muse-0.6.2/master/lmaster.h (-1 / +1 lines)
 Lines 41-47    Link Here 
      void songChanged(int);
      void songChanged(int);
   signals:
   signals:
      void deleted(int);
      void deleted(void*);
   public:
   public:
      LMaster();
      LMaster();
(-) muse-0.6.2/master/masteredit.cpp (-1 / +1 lines)
 Lines 49-55    Link Here 
void MasterEdit::closeEvent(QCloseEvent* e)
void MasterEdit::closeEvent(QCloseEvent* e)
      {
      {
      emit deleted((int)this);
      emit deleted(this);
      e->accept();
      e->accept();
      }
      }
(-) muse-0.6.2/master/masteredit.h (-1 / +1 lines)
 Lines 59-65    Link Here 
//      void tempoChanged(double);
//      void tempoChanged(double);
   signals:
   signals:
      void deleted(int);
      void deleted(void*);
   public:
   public:
      MasterEdit();
      MasterEdit();
(-) muse-0.6.2/memory.h (-2 / +2 lines)
 Lines 50-56    Link Here 
      {
      {
      int idx = ((n + sizeof(int) - 1) / sizeof(int)) - 1;
      int idx = ((n + sizeof(int) - 1) / sizeof(int)) - 1;
      if (idx >= dimension) {
      if (idx >= dimension) {
            printf("panic: alloc %d\n", n);
            printf("panic: alloc %lu\n", n);
            exit(-1);
            exit(-1);
            }
            }
      if (head[idx] == 0)
      if (head[idx] == 0)
 Lines 68-74    Link Here 
      {
      {
      int idx = ((n + sizeof(int) - 1) / sizeof(int)) - 1;
      int idx = ((n + sizeof(int) - 1) / sizeof(int)) - 1;
      if (idx >= dimension) {
      if (idx >= dimension) {
            printf("panic: alloc %d\n", n);
            printf("panic: alloc %lu\n", n);
            exit(-1);
            exit(-1);
            }
            }
      Verweis* p = static_cast<Verweis*>(b);
      Verweis* p = static_cast<Verweis*>(b);
(-) muse-0.6.2/midi.cpp (-2 / +2 lines)
 Lines 522-530    Link Here 
            MidiEvent* event = readEvent(track);
            MidiEvent* event = readEvent(track);
            if (event == 0)
            if (event == 0)
                  break;
                  break;
            if (int(event) == -1)
            if (long(event) == -1)
                  continue;
                  continue;
            if (int(event) == -2)         // error
            if (long(event) == -2)         // error
                  return true;
                  return true;
            if (lastchan == -1) {
            if (lastchan == -1) {
                  el->add(event);         // kann kein channel event sein
                  el->add(event);         // kann kein channel event sein
(-) muse-0.6.2/midiedit/drumedit.cpp (-1 / +1 lines)
 Lines 133-139    Link Here 
      _dlistWidthInit = *it; //There are only 2 values stored in the sizelist, size of dlist widget and dcanvas widget 
      _dlistWidthInit = *it; //There are only 2 values stored in the sizelist, size of dlist widget and dcanvas widget 
      it++; 
      it++; 
      _dcanvasWidthInit = *it; 
      _dcanvasWidthInit = *it; 
      emit deleted((int)this);
      emit deleted(this);
      e->accept();
      e->accept();
      }
      }
(-) muse-0.6.2/midiedit/drumedit.h (-1 / +1 lines)
 Lines 120-126    Link Here 
      void dlistSelectionChanged(DrumMap*); // called by dlist
      void dlistSelectionChanged(DrumMap*); // called by dlist
   signals:
   signals:
      void deleted(int);
      void deleted(void*);
      void keyFilterChanged(int);
      void keyFilterChanged(int);
   public:
   public:
(-) muse-0.6.2/midiedit/pianoroll.cpp (-1 / +1 lines)
 Lines 446-452    Link Here 
void PianoRoll::closeEvent(QCloseEvent* e)
void PianoRoll::closeEvent(QCloseEvent* e)
      {
      {
      emit deleted((int)this);
      emit deleted(this);
      e->accept();
      e->accept();
      }
      }
(-) muse-0.6.2/midiedit/pianoroll.h (-1 / +1 lines)
 Lines 108-114    Link Here 
      void songChanged1(int);
      void songChanged1(int);
   signals:
   signals:
      void deleted(int);
      void deleted(void *);
   public:
   public:
      PianoRoll(PartList*, QWidget* parent = 0, const char* name = 0);
      PianoRoll(PartList*, QWidget* parent = 0, const char* name = 0);
(-) muse-0.6.2/mixer/amixer.cpp (-1 / +1 lines)
 Lines 753-759    Link Here 
void AudioMixerApp::closeEvent(QCloseEvent* e)
void AudioMixerApp::closeEvent(QCloseEvent* e)
      {
      {
      emit deleted((int)this);
      emit deleted(this);
      e->accept();
      e->accept();
      }
      }
(-) muse-0.6.2/mixer/amixer.h (-1 / +1 lines)
 Lines 94-100    Link Here 
      void updateOutputRoute();
      void updateOutputRoute();
   signals:
   signals:
      void deleted(int);
      void deleted(void*);
   private slots:
   private slots:
      void heartBeat();
      void heartBeat();
(-) muse-0.6.2/mixer/mixer.cpp (-1 / +1 lines)
 Lines 226-232    Link Here 
void Mixer::closeEvent(QCloseEvent* e)
void Mixer::closeEvent(QCloseEvent* e)
      {
      {
      emit deleted((int)this);
      emit deleted(this);
      e->accept();
      e->accept();
      }
      }
(-) muse-0.6.2/mixer/mixer.h (-1 / +1 lines)
 Lines 60-66    Link Here 
      void masterChanged(int val);
      void masterChanged(int val);
   signals:
   signals:
      void deleted(int);
      void deleted(void*);
      void ctrlChanged(int port, int chan, int ctrl, int val);
      void ctrlChanged(int port, int chan, int ctrl, int val);
      void masterVolChanged(int val);
      void masterVolChanged(int val);
(-) muse-0.6.2/score/score.cpp (-1 / +1 lines)
 Lines 360-366    Link Here 
void Score::closeEvent(QCloseEvent* e)
void Score::closeEvent(QCloseEvent* e)
      {
      {
      emit deleted((int)this);
      emit deleted(this);
      e->accept();
      e->accept();
      }
      }
(-) muse-0.6.2/score/score.h (-1 / +1 lines)
 Lines 91-97    Link Here 
   signals:
   signals:
      void rasterChanged(int);
      void rasterChanged(int);
      void quantChanged(int);
      void quantChanged(int);
      void deleted(int);
      void deleted(void*);
   public:
   public:
      Score(PartList*);
      Score(PartList*);
(-) muse-0.6.2/synti/synth.cpp (-1 / +1 lines)
 Lines 334-340    Link Here 
            nsynthis = list->count();
            nsynthis = list->count();
            if (debugMsg)
            if (debugMsg)
                  printf("%d soft synth found\n", nsynthis);
                  printf("%d soft synth found\n", nsynthis);
            synthis  = new (Synth*)[nsynthis];
            synthis  = new Synth*[nsynthis];
            QFileInfoListIterator it(*list);
            QFileInfoListIterator it(*list);
            QFileInfo* fi;
            QFileInfo* fi;
            int i = 0;
            int i = 0;
(-) muse-0.6.2/track.cpp (-1 / +1 lines)
 Lines 95-101    Link Here 
void Track::dump() const
void Track::dump() const
      {
      {
      printf("Track <%s>: typ %d, parts %d sel %d\n",
      printf("Track <%s>: typ %d, parts %lu sel %d\n",
         _name.latin1(), _type, _parts.size(), _selected);
         _name.latin1(), _type, _parts.size(), _selected);
      }
      }
(-) muse-0.6.2/waveedit/waveedit.cpp (-1 / +1 lines)
 Lines 57-63    Link Here 
void WaveEdit::closeEvent(QCloseEvent* e)
void WaveEdit::closeEvent(QCloseEvent* e)
      {
      {
      emit deleted((int)this);
      emit deleted(this);
      e->accept();
      e->accept();
      }
      }
(-) muse-0.6.2/waveedit/waveedit.h (-1 / +1 lines)
 Lines 48-54    Link Here 
      void soloChanged(bool flag);
      void soloChanged(bool flag);
   signals:
   signals:
      void deleted(int);
      void deleted(void*);
   public:
   public:
      WaveEdit(PartList*);
      WaveEdit(PartList*);