← Back to branch summary

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

« back to all changes in this revision

Viewing changes to muse/part.h

  • 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/part.h
17
17
#include <uuid/uuid.h>
18
18
 
19
19
#include "event.h"
 
20
#include "audioconvert.h"
20
21
 
21
22
class Track;
22
23
class MidiTrack;
23
24
class WaveTrack;
24
25
class Xml;
25
26
class Part;
 
27
//class AudioConvertMap;
26
28
 
27
29
// typedef std::multimap<unsigned, Event*, std::less<unsigned> >::iterator iEvent;
28
30
 
121
123
 
122
124
class WavePart : public Part {
123
125
 
 
126
      // p3.3.31
 
127
      AudioConvertMap _converters;
 
128
      
124
129
   public:
125
130
      WavePart(WaveTrack* t);
126
131
      WavePart(WaveTrack* t, EventList* ev);