diff --git a/projectMTrunk.kdevelop b/projectMTrunk.kdevelop
index 0c5704167..8f113e2d3 100644
--- a/projectMTrunk.kdevelop
+++ b/projectMTrunk.kdevelop
@@ -10,16 +10,16 @@
projectMTrunk
.
false
-
-
+
+
executable
/home/carm/projects/projectM/trunk/src/projectM-pulseaudio/projectM-pulseaudio
-
-
+
+
/home/carm/projects/projectM/trunk/src/
false
false
@@ -51,9 +51,9 @@
0
-
-
-
+
+
+
default
@@ -64,9 +64,9 @@
2
0
false
-
-
-
+
+
+
default
@@ -75,11 +75,11 @@
-
-
-
-
-
+
+
+
+
+
true
false
false
@@ -160,7 +160,7 @@
true
true
true
- 150
+ 500
400
250
false
@@ -180,7 +180,7 @@
.;
-
+
set
m_,_
theValue
diff --git a/projectMTrunk.kdevelop.pcs b/projectMTrunk.kdevelop.pcs
index 7a4e160a2..683a8a2ca 100644
Binary files a/projectMTrunk.kdevelop.pcs and b/projectMTrunk.kdevelop.pcs differ
diff --git a/projectMTrunk.kdevses b/projectMTrunk.kdevses
index 3ef166f16..ea822697e 100644
--- a/projectMTrunk.kdevses
+++ b/projectMTrunk.kdevses
@@ -1,43 +1,28 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -53,6 +38,10 @@
+
+
+
+
diff --git a/src/projectM-engine/KeyHandler.cpp b/src/projectM-engine/KeyHandler.cpp
index 7484ad230..4937e039a 100755
--- a/src/projectM-engine/KeyHandler.cpp
+++ b/src/projectM-engine/KeyHandler.cpp
@@ -165,24 +165,8 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
case PROJECTM_K_b:
break;
case PROJECTM_K_n:
-
- m_presetChooser->nextPreset(*m_presetPos);
-/*
- if (m_presetChooser->empty())
- break;
-
- // Case: idle preset currently running, selected first preset of chooser
- else if (*m_presetPos == m_presetChooser->end()) {
- (*m_presetPos = m_presetChooser->begin());
- }
- else
- ++(*m_presetPos);
-
- // Case: already at last preset, loop to beginning
- if (((*m_presetPos) == m_presetChooser->end())) {
- *m_presetPos = m_presetChooser->begin();
- }*/
-
+ m_presetChooser->nextPreset(*m_presetPos);
+ presetSwitchedEvent(true, **m_presetPos);
m_activePreset = m_presetPos->allocate(this->presetInputs, this->presetOutputs);
renderer->setPresetName(m_activePreset->presetName());
timeKeeper->StartPreset();
@@ -194,7 +178,7 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
break;
*m_presetPos = m_presetChooser->weightedRandom();
-
+ presetSwitchedEvent(true, **m_presetPos);
m_activePreset = m_presetPos->allocate(this->presetInputs, this->presetOutputs);
assert(m_activePreset.get());
diff --git a/src/projectM-engine/projectM.cpp b/src/projectM-engine/projectM.cpp
index 988b0fd9e..d59b456de 100755
--- a/src/projectM-engine/projectM.cpp
+++ b/src/projectM-engine/projectM.cpp
@@ -415,7 +415,6 @@ void projectM::projectM_init ( int gx, int gy, int fps, int texsize, int width,
/** We need to initialise this before the builtin param db otherwise bass/mid etc won't bind correctly */
assert ( !beatDetect );
- std::cerr << "pcm new" << std::endl;
if (!_pcm)
_pcm = new PCM();
assert(pcm());
@@ -432,7 +431,7 @@ void projectM::projectM_init ( int gx, int gy, int fps, int texsize, int width,
this->presetInputs2.gy = gy;
this->renderer = new Renderer ( width, height, gx, gy, texsize, beatDetect, settings().presetURL, settings().titleFontURL, settings().menuFontURL );
-
+
running = true;
#ifdef USE_THREADS
@@ -440,11 +439,11 @@ void projectM::projectM_init ( int gx, int gy, int fps, int texsize, int width,
pthread_cond_init(&condition, NULL);
if (pthread_create(&thread, NULL, thread_callback, this) != 0)
{
- printf("oops\n");
+
+ std::cerr << "failed to allocate a thread! try building with option USE_THREADS turned off" << std::endl;;
exit(1);
}
pthread_mutex_lock( &mutex );
- printf("got lock\n");
#endif
renderer->setPresetName ( m_activePreset->presetName() );
diff --git a/src/projectM-qt/qplaylistmodel.cpp b/src/projectM-qt/qplaylistmodel.cpp
index 8e5983c18..272672d71 100644
--- a/src/projectM-qt/qplaylistmodel.cpp
+++ b/src/projectM-qt/qplaylistmodel.cpp
@@ -88,7 +88,7 @@ bool QPlaylistModel::setData ( const QModelIndex & index, const QVariant & value
Qt::ItemFlags QPlaylistModel::flags(const QModelIndex &index) const
{
Qt::ItemFlags defaultFlags = QAbstractTableModel::flags(index);
-
+
if (index.isValid())
return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
else
@@ -189,6 +189,7 @@ QVariant QPlaylistModel::data ( const QModelIndex & index, int role = Qt::Displa
case QPlaylistModel::RatingRole:
return QVariant ( m_projectM.getPresetRating(index.row()) );
case Qt::BackgroundRole:
+
if (!m_projectM.selectedPresetIndex(pos))
return QVariant();
if (m_projectM.isPresetLocked() && ( index.row() == pos ) )
@@ -199,6 +200,7 @@ QVariant QPlaylistModel::data ( const QModelIndex & index, int role = Qt::Displa
case QPlaylistModel::URLInfoRole:
return QVariant ( QString ( m_projectM.getPresetURL ( index.row() ).c_str() ) );
default:
+
return QVariant();
}
}