merged with trunk

1 files changed, 1 insertions, 7 deletions

diff --git a/muse2/muse/gconfig.h b/muse2/muse/gconfig.h
index 4ba9efea..a76b7e13 100644
--- a/muse2/muse/gconfig.h
+++ b/muse2/muse/gconfig.h
@@ -71,11 +71,7 @@ struct MixerConfig {
       bool showAuxTracks;
       bool showSyntiTracks;
 
-      //void write(MusECore::Xml&, const char* name);
-      //void write(int level, MusECore::Xml& xml, const char* name);
       void write(int level, MusECore::Xml& xml);
-      //void read(QDomNode);
-      //void read(MusECore::Xml& xml, const QString& name);
       void read(MusECore::Xml& xml);
       };
 
@@ -92,7 +88,6 @@ struct GlobalConfigValues {
       QColor bigTimeForegroundColor;
       QColor bigTimeBackgroundColor;
       QColor waveEditBackgroundColor;
-      //QFont fonts[6];
       QFont fonts[NUM_FONTS];
       QColor trackBg;
       QColor selectTrackBg;
@@ -148,12 +143,10 @@ struct GlobalConfigValues {
       QRect geometryMain;
       QRect geometryTransport;
       QRect geometryBigTime;
-//      QRect geometryMixer;
       MixerConfig mixer1;
       MixerConfig mixer2;
       bool transportVisible;
       bool bigTimeVisible;
-//      bool mixerVisible;
       bool mixer1Visible;
       bool mixer2Visible;
       bool markerVisible;
@@ -188,6 +181,7 @@ struct GlobalConfigValues {
       bool addHiddenTracks;
       bool unhideTracks;
       drumTrackPreference_t drumTrackPreference;
+      bool smartFocus;
       };