← Back to branch summary

~ari-tczew/ubuntu/natty/clementine/lp-747113

« back to all changes in this revision

Viewing changes to src/visualisations/projectmvisualisation.cpp

  • Committer: Artur Rona
  • Date: 2011-04-04 20:05:33 UTC
  • Revision ID: ari-tczew@ubuntu.com-20110404200533-6aclzasj5pp8t1hq
https://launchpad.net/bugs/747113
* New upstream release. (LP: #747113)
* Drop all patches, have been applied upstream.
* Update debian/copyright.
* Refresh description in debian/control in order to avoid lintian error.
* Bump debhelper to 8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/visualisations/projectmvisualisation.cpp
66
66
void ProjectMVisualisation::InitProjectM() {
67
67
  // Find the projectM presets
68
68
  QStringList paths = QStringList()
69
 
#ifdef VISUALISATIONS_USE_INSTALL_PREFIX
 
69
#ifdef USE_INSTALL_PREFIX
70
70
      << CMAKE_INSTALL_PREFIX "/share/clementine/projectm-presets"
71
71
      << CMAKE_INSTALL_PREFIX "/share/projectM/presets"
72
72
#endif
161
161
    projectm_->changePresetDuration(duration_);
162
162
}
163
163
 
164
 
void ProjectMVisualisation::ConsumeBuffer(GstBuffer *buffer, GstEnginePipeline*) {
165
 
#ifdef HAVE_GSTREAMER
 
164
void ProjectMVisualisation::ConsumeBuffer(GstBuffer* buffer, int) {
166
165
  const int samples_per_channel = GST_BUFFER_SIZE(buffer) / sizeof(short) / 2;
167
166
  const short* data = reinterpret_cast<short*>(GST_BUFFER_DATA(buffer));
168
167
 
169
168
  if (projectm_)
170
169
    projectm_->pcm()->addPCM16Data(data, samples_per_channel);
171
170
  gst_buffer_unref(buffer);
172
 
#endif
173
171
}
174
172
 
175
173
void ProjectMVisualisation::SetSelected(const QStringList& paths, bool selected) {