summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
Diffstat (limited to 'muse2')
-rw-r--r--muse2/ChangeLog6
-rw-r--r--muse2/muse/app.cpp27
-rw-r--r--muse2/muse/arranger/arrangerview.cpp6
-rw-r--r--muse2/muse/marker/markerview.cpp6
-rw-r--r--muse2/synti/fluid/fluidgui.cpp6
-rw-r--r--muse2/synti/fluidsynth/fluidsynthgui.cpp6
-rw-r--r--muse2/synti/organ/organgui.cpp6
-rw-r--r--muse2/synti/vam/vamgui.cpp6
8 files changed, 48 insertions, 21 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index b5cbc4c6..90d3258f 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,9 @@
+21.11.2012:
+ * Fixed: Markers and synth windows don't open at all on some desktops like Lubuntu. (Tim)
+ Solution was combination of REMOVAL of fix for "bug: 2811156 Softsynth GUI unclosable..."
+ (of which said removal BY ITSELF DID NOT FIX this problem) AND removal of some superfluous show()s.
+ Tested OK with Lubuntu and XFCE (which the original fix was for).
+ Thanx to knowledgable tester who told us to remove that bugfix.
20.11.2012:
- Fixed audio stuttering loud annoying repeated segments upon seek. (Tim)
Slight readjustment of audio prefetch and midi thread priority (-5 and -1 instead of +1 and +2).
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index e0fffd4d..45492889 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -1555,11 +1555,14 @@ void MusE::showMarker(bool flag)
markerView = new MusEGui::MarkerView(this);
connect(markerView, SIGNAL(closed()), SLOT(markerClosed()));
- markerView->show();
+ // Nov 21, 2012 Hey this causes the thing not to open at all, EVER, on Lubuntu and some others!
+ //markerView->show(); // ??? REMOVE Tim. Superfluous?
toplevels.push_back(markerView);
}
- markerView->setVisible(flag);
- viewMarkerAction->setChecked(flag);
+ if(markerView->isVisible() != flag)
+ markerView->setVisible(flag);
+ if(viewMarkerAction->isChecked() != flag)
+ viewMarkerAction->setChecked(flag); // ??? TEST: Recursion? Does this call toggleMarker if called from menu? No. Why? It should. REMOVE Tim. Or keep.
if (!flag)
if (currentMenuSharingTopwin == markerView)
setCurrentMenuSharingTopwin(NULL);
@@ -1573,7 +1576,8 @@ void MusE::showMarker(bool flag)
void MusE::markerClosed()
{
- viewMarkerAction->setChecked(false);
+ if(viewMarkerAction->isChecked())
+ viewMarkerAction->setChecked(false); // ??? TEST: Recursion? Does this call toggleMarker? Yes. REMOVE Tim. Or keep.
if (currentMenuSharingTopwin == markerView)
setCurrentMenuSharingTopwin(NULL);
@@ -1609,8 +1613,10 @@ void MusE::toggleArranger(bool checked)
void MusE::showArranger(bool flag)
{
- arrangerView->setVisible(flag);
- viewArrangerAction->setChecked(flag);
+ if(arrangerView->isVisible() != flag)
+ arrangerView->setVisible(flag);
+ if(viewArrangerAction->isChecked() != flag)
+ viewArrangerAction->setChecked(flag);
if (!flag)
if (currentMenuSharingTopwin == arrangerView)
setCurrentMenuSharingTopwin(NULL);
@@ -1623,7 +1629,8 @@ void MusE::showArranger(bool flag)
void MusE::arrangerClosed()
{
- viewArrangerAction->setChecked(false);
+ if(viewArrangerAction->isChecked())
+ viewArrangerAction->setChecked(false);
updateWindowMenu();
// focus the last activated topwin which is not the arranger view
@@ -1656,8 +1663,10 @@ void MusE::toggleTransport(bool checked)
void MusE::showTransport(bool flag)
{
- transport->setVisible(flag);
- viewTransportAction->setChecked(flag);
+ if(transport->isVisible() != flag)
+ transport->setVisible(flag);
+ if(viewTransportAction->isChecked() != flag)
+ viewTransportAction->setChecked(flag);
}
//---------------------------------------------------------
diff --git a/muse2/muse/arranger/arrangerview.cpp b/muse2/muse/arranger/arrangerview.cpp
index a2024159..e91d05f6 100644
--- a/muse2/muse/arranger/arrangerview.cpp
+++ b/muse2/muse/arranger/arrangerview.cpp
@@ -359,8 +359,10 @@ ArrangerView::ArrangerView(QWidget* parent)
// for certain window managers, e.g xfce, this window is
// is displayed although not specifically set to show();
// bug: 2811156 Softsynth GUI unclosable with XFCE4 (and a few others)
- show();
- hide();
+ // Nov 21, 2012 Hey this causes the thing not to open at all, EVER, on Lubuntu and some others!
+ // And we had a request to remove this from a knowledgable tester. REMOVE Tim.
+ ///show();
+ ///hide();
}
ArrangerView::~ArrangerView()
diff --git a/muse2/muse/marker/markerview.cpp b/muse2/muse/marker/markerview.cpp
index 5a5f9a2a..39d8e748 100644
--- a/muse2/muse/marker/markerview.cpp
+++ b/muse2/muse/marker/markerview.cpp
@@ -281,8 +281,10 @@ MarkerView::MarkerView(QWidget* parent)
// for certain window managers, e.g xfce, this window is
// is displayed although not specifically set to show();
// bug: 2811156 Softsynth GUI unclosable with XFCE4 (and a few others)
- show();
- hide();
+ // Nov 21, 2012 Hey this causes the thing not to open at all, EVER, on Lubuntu and some others!
+ // And we had a request to remove this from a knowledgable tester. REMOVE Tim.
+ ///show();
+ ///hide();
}
//---------------------------------------------------------
diff --git a/muse2/synti/fluid/fluidgui.cpp b/muse2/synti/fluid/fluidgui.cpp
index c9477b6b..1d92aa37 100644
--- a/muse2/synti/fluid/fluidgui.cpp
+++ b/muse2/synti/fluid/fluidgui.cpp
@@ -58,8 +58,10 @@ FLUIDGui::FLUIDGui()
// for certain window managers, e.g xfce, this window is
// is displayed although not specifically set to show();
// bug: 2811156 Softsynth GUI unclosable with XFCE4 (and a few others)
- show();
- hide();
+ // Nov 21, 2012 Hey this causes the thing not to open at all, EVER, on Lubuntu and some others!
+ // And we had a request to remove this from a knowledgable tester. REMOVE Tim.
+ ///show();
+ ///hide();
}
//---------------------------------------------------------
diff --git a/muse2/synti/fluidsynth/fluidsynthgui.cpp b/muse2/synti/fluidsynth/fluidsynthgui.cpp
index b6a3a4bd..b1492dae 100644
--- a/muse2/synti/fluidsynth/fluidsynthgui.cpp
+++ b/muse2/synti/fluidsynth/fluidsynthgui.cpp
@@ -135,8 +135,10 @@ FluidSynthGui::FluidSynthGui()
// for certain window managers, e.g xfce, this window is
// is displayed although not specifically set to show();
// bug: 2811156 Softsynth GUI unclosable with XFCE4 (and a few others)
- show();
- hide();
+ // Nov 21, 2012 Hey this causes the thing not to open at all, EVER, on Lubuntu and some others!
+ // And we had a request to remove this from a knowledgable tester. REMOVE Tim.
+ ///show();
+ ///hide();
}
FluidSynthGui::~FluidSynthGui()
diff --git a/muse2/synti/organ/organgui.cpp b/muse2/synti/organ/organgui.cpp
index 21f8e828..d95ac67f 100644
--- a/muse2/synti/organ/organgui.cpp
+++ b/muse2/synti/organ/organgui.cpp
@@ -85,8 +85,10 @@ OrganGui::OrganGui()
// for certain window managers, e.g xfce, this window is
// is displayed although not specifically set to show();
// bug: 2811156 Softsynth GUI unclosable with XFCE4 (and a few others)
- show();
- hide();
+ // Nov 21, 2012 Hey this causes the thing not to open at all, EVER, on Lubuntu and some others!
+ // And we had a request to remove this from a knowledgable tester. REMOVE Tim.
+ ///show();
+ ///hide();
}
//---------------------------------------------------------
diff --git a/muse2/synti/vam/vamgui.cpp b/muse2/synti/vam/vamgui.cpp
index 31efc389..3c37573a 100644
--- a/muse2/synti/vam/vamgui.cpp
+++ b/muse2/synti/vam/vamgui.cpp
@@ -254,8 +254,10 @@ VAMGui::VAMGui()
// for certain window managers, e.g xfce, this window is
// is displayed although not specifically set to show();
// bug: 2811156 Softsynth GUI unclosable with XFCE4 (and a few others)
- show();
- hide();
+ // Nov 21, 2012 Hey this causes the thing not to open at all, EVER, on Lubuntu and some others!
+ // And we had a request to remove this from a knowledgable tester. REMOVE Tim.
+ ///show();
+ ///hide();
}
//---------------------------------------------------------
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 06:40:37 +0000