Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

gstreamer-cdda is in gst-plugins-base in 1.0 and has a different header name. 

This still doesn't work because the API has changed and track listings are
now delivered via a bus message instead of direct access to the struct's
members.
This commit is contained in:
David Sansome 2014-09-22 22:28:53 +10:00
parent 8d3839603b
commit 39d99247a2
5 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -64,7 +64,6 @@ pkg_check_modules(GSTREAMER REQUIRED gstreamer-1.0)
pkg_check_modules(GSTREAMER_APP REQUIRED gstreamer-app-1.0)
pkg_check_modules(GSTREAMER_AUDIO REQUIRED gstreamer-audio-1.0)
pkg_check_modules(GSTREAMER_BASE REQUIRED gstreamer-base-1.0)
#pkg_check_modules(GSTREAMER_CDDA gstreamer-cdda-0.10)
pkg_check_modules(GSTREAMER_TAG REQUIRED gstreamer-tag-1.0)
pkg_check_modules(INDICATEQT indicate-qt)
pkg_check_modules(LIBGPOD libgpod-1.0>=0.7.92)
@ -154,7 +153,6 @@ include_directories(${GSTREAMER_INCLUDE_DIRS})
include_directories(${GSTREAMER_APP_INCLUDE_DIRS})
include_directories(${GSTREAMER_AUDIO_INCLUDE_DIRS})
include_directories(${GSTREAMER_BASE_INCLUDE_DIRS})
include_directories(${GSTREAMER_CDDA_INCLUDE_DIRS})
include_directories(${GSTREAMER_TAG_INCLUDE_DIRS})
include_directories(${GLIB_INCLUDE_DIRS})
include_directories(${GLIBCONFIG_INCLUDE_DIRS})

1
src/CMakeLists.txt
View File

@ -1269,7 +1269,6 @@ endif(HAVE_GIO)
if(HAVE_AUDIOCD)
target_link_libraries(clementine_lib ${CDIO_LIBRARIES})
target_link_libraries(clementine_lib ${GSTREAMER_CDDA_LIBRARIES})
endif(HAVE_AUDIOCD)
if(HAVE_MOODBAR)

6
src/core/songloader.cpp
View File

@ -27,7 +27,7 @@
#include <QtDebug>
#ifdef HAVE_AUDIOCD
#include <gst/cdda/gstcddabasesrc.h>
#include <gst/audio/gstaudiocdsrc.h>
#endif
#include "config.h"
@ -158,10 +158,8 @@ SongLoader::Result SongLoader::LoadAudioCD() {
// Get number of tracks
GstFormat fmt = gst_format_get_by_nick("track");
GstFormat out_fmt = fmt;
gint64 num_tracks = 0;
if (!gst_element_query_duration(cdda, &out_fmt, &num_tracks) ||
out_fmt != fmt) {
if (!gst_element_query_duration(cdda, fmt, &num_tracks)) {
qLog(Error) << "Error while querying cdda GstElement";
gst_object_unref(GST_OBJECT(cdda));
return Error;

2
src/devices/cddadevice.h
View File

@ -22,7 +22,7 @@
// These must come after Qt includes (issue 3247)
#include <cdio/cdio.h>
#include <gst/cdda/gstcddabasesrc.h>
#include <gst/audio/gstaudiocdsrc.h>
#include "connecteddevice.h"
#include "core/song.h"

2
src/devices/cddalister.h
View File

@ -18,8 +18,6 @@
#ifndef CDDALISTER_H
#define CDDALISTER_H
#include <gst/cdda/gstcddabasesrc.h>
#include <QStringList>
#include "devicelister.h"