mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-05 22:45:44 +00:00
Code Issues Projects Releases Wiki Activity

bug fix on playlist item highlights (when user presses n / r / [ ).

Browse Source 
some code cleanup 


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@980 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2008-04-26 02:24:53 +00:00
parent bd9e2de928
commit abdfe32bc7
6 changed files with 45 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
projectMTrunk.kdevelop
View File

@ -10,16 +10,16 @@
<projectname>projectMTrunk</projectname>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
<description/>
<defaultencoding/>
<description></description>
<defaultencoding></defaultencoding>
<versioncontrol/>
</general>
<kdevcustomproject>
<run>
<directoryradio>executable</directoryradio>
<mainprogram>/home/carm/projects/projectM/trunk/src/projectM-pulseaudio/projectM-pulseaudio</mainprogram>
<programargs/>
<globaldebugarguments/>
<programargs></programargs>
<globaldebugarguments></globaldebugarguments>
<globalcwd>/home/carm/projects/projectM/trunk/src/</globalcwd>
<useglobalprogram>false</useglobalprogram>
<terminal>false</terminal>
@ -51,9 +51,9 @@
</build>
<other>
<prio>0</prio>
<otherbin/>
<defaulttarget/>
<otheroptions/>
<otherbin></otherbin>
<defaulttarget></defaulttarget>
<otheroptions></otheroptions>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
@ -64,9 +64,9 @@
<numberofjobs>2</numberofjobs>
<prio>0</prio>
<dontact>false</dontact>
<makebin/>
<defaulttarget/>
<makeoptions/>
<makebin></makebin>
<defaulttarget></defaulttarget>
<makeoptions></makeoptions>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
@ -75,11 +75,11 @@
</kdevcustomproject>
<kdevdebugger>
<general>
<dbgshell/>
<gdbpath/>
<configGdbScript/>
<runShellScript/>
<runGdbScript/>
<dbgshell></dbgshell>
<gdbpath></gdbpath>
<configGdbScript></configGdbScript>
<runShellScript></runShellScript>
<runGdbScript></runGdbScript>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
@ -160,7 +160,7 @@
<automaticCodeCompletion>true</automaticCodeCompletion>
<automaticArgumentsHint>true</automaticArgumentsHint>
<automaticHeaderCompletion>true</automaticHeaderCompletion>
<codeCompletionDelay>150</codeCompletionDelay>
<codeCompletionDelay>500</codeCompletionDelay>
<argumentsHintDelay>400</argumentsHintDelay>
<headerCompletionDelay>250</headerCompletionDelay>
<showOnlyAccessibleItems>false</showOnlyAccessibleItems>
@ -180,7 +180,7 @@
<includePaths>.;</includePaths>
</codecompletion>
<creategettersetter>
<prefixGet/>
<prefixGet></prefixGet>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>

BIN
projectMTrunk.kdevelop.pcs
View File

Binary file not shown.

49
projectMTrunk.kdevses
View File

@ -1,43 +1,28 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
<DocsAndViews NumberOfDocuments="12" >
<Doc0 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/RandomNumberGenerators.hpp" >
<View0 Encoding="" Type="Source" />
<DocsAndViews NumberOfDocuments="7" >
<Doc0 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/projectM.hpp" >
<View0 Encoding="" line="118" Type="Source" />
</Doc0>
<Doc1 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/CMakeLists.txt" >
<View0 Encoding="" line="9" Type="Source" />
<Doc1 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/qplaylistmodel.cpp" >
<View0 Encoding="" line="13" Type="Source" />
</Doc1>
<Doc2 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/projectM.cpp" >
<View0 Encoding="" Type="Source" />
<Doc2 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/CMakeFiles/cmake.check_cache" >
<View0 Encoding="" line="0" Type="Source" />
</Doc2>
<Doc3 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/PCM.cpp" >
<View0 Encoding="" Type="Source" />
<Doc3 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/projectM.cpp" >
<View0 Encoding="" line="369" Type="Source" />
</Doc3>
<Doc4 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/qplaylistmodel.hpp" >
<View0 Encoding="" Type="Source" />
<Doc4 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/moc_qprojectm_mainwindow.cxx" >
<View0 Encoding="" line="0" Type="Source" />
</Doc4>
<Doc5 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/qplaylistmodel.cpp" >
<View0 Encoding="" Type="Source" />
<Doc5 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/KeyHandler.cpp" >
<View0 Encoding="" line="1" Type="Source" />
</Doc5>
<Doc6 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/qxmlplaylisthandler.hpp" >
<View0 Encoding="" Type="Source" />
<Doc6 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/PresetChooser.hpp" >
<View0 Encoding="" line="129" Type="Source" />
</Doc6>
<Doc7 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/projectM.hpp" >
<View0 Encoding="" line="23" Type="Source" />
</Doc7>
<Doc8 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/qprojectm_mainwindow.cpp" >
<View0 Encoding="" line="84" Type="Source" />
</Doc8>
<Doc9 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/qprojectmconfigdialog.cpp" >
<View0 Encoding="" Type="Source" />
</Doc9>
<Doc10 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/qprojectm_mainwindow.hpp" >
<View0 Encoding="" line="169" Type="Source" />
</Doc10>
<Doc11 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/CMakeLists.txt" >
<View0 Encoding="" line="34" Type="Source" />
</Doc11>
</DocsAndViews>
<pluginList>
<kdevdebugger>
@ -53,6 +38,10 @@
<bookmark url="/home/carm/projects/projectM/trunk/src/qprojectM-pulseaudio/qprojectM-pulseaudio.cpp" >
<mark line="133" />
</bookmark>
<bookmark url="/home/carm/projects/projectM/trunk/src/projectM-engine/KeyHandler.cpp" >
<mark line="180" />
<mark line="181" />
</bookmark>
<bookmark url="/home/carm/projects/projectM/trunk/src/qprojectM/qplaylistmodel.cpp" >
<mark line="3" />
</bookmark>

22
src/projectM-engine/KeyHandler.cpp
View File

@ -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());

7
src/projectM-engine/projectM.cpp
View File

@ -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() );

4
src/projectM-qt/qplaylistmodel.cpp
View File

@ -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();
}
}