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

Use decodebin2 in the transcoder, and bundle the extra plugins to make it work in Windows

This commit is contained in:
David Sansome 2010-06-17 14:55:50 +00:00
parent ae3b500259
commit 1c4004ff0f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/windows/clementine.nsi.in vendored
View File

@ -51,6 +51,7 @@ Section "Clementine" Clementine
File "iconv.dll"
File "libbz2.dll"
File "libdl.dll"
File "libfaac-0.dll"
File "libfaad-2.dll"
File "libFLAC-8.dll"
File "libgcrypt-11.dll"
@ -79,6 +80,7 @@ Section "Clementine" Clementine
File "libgthread-2.0-0.dll"
File "liblastfm.dll"
File "libmms-0.dll"
File "libmp3lame-0.dll"
File "libogg-0.dll"
File "liboil-0.3-0.dll"
File "libsoup-2.4-1.dll"
@ -117,12 +119,14 @@ Section "Gstreamer plugins" gstreamer-plugins
File "/oname=libgstcoreelements.dll" "gstreamer-plugins\libgstcoreelements.dll"
File "/oname=libgstdecodebin2.dll" "gstreamer-plugins\libgstdecodebin2.dll"
File "/oname=libgstdirectsoundsink.dll" "gstreamer-plugins\libgstdirectsoundsink.dll"
File "/oname=libgstfaac.dll" "gstreamer-plugins\libgstfaac.dll"
File "/oname=libgstfaad.dll" "gstreamer-plugins\libgstfaad.dll"
File "/oname=libgstffmpeg-gpl.dll" "gstreamer-plugins\libgstffmpeg-gpl.dll"
File "/oname=libgstflac.dll" "gstreamer-plugins\libgstflac.dll"
File "/oname=libgstgio.dll" "gstreamer-plugins\libgstgio.dll"
File "/oname=libgsticydemux.dll" "gstreamer-plugins\libgsticydemux.dll"
File "/oname=libgstid3demux.dll" "gstreamer-plugins\libgstid3demux.dll"
File "/oname=libgstlame.dll" "gstreamer-plugins\libgstlame.dll"
File "/oname=libgstmad.dll" "gstreamer-plugins\libgstmad.dll"
File "/oname=libgstmms.dll" "gstreamer-plugins\libgstmms.dll"
File "/oname=libgstogg.dll" "gstreamer-plugins\libgstogg.dll"
@ -769,6 +773,7 @@ Section "Uninstall"
Delete "$INSTDIR\iconv.dll"
Delete "$INSTDIR\libbz2.dll"
Delete "$INSTDIR\libdl.dll"
Delete "$INSTDIR\libfaac-0.dll"
Delete "$INSTDIR\libfaad-2.dll"
Delete "$INSTDIR\libFLAC-8.dll"
Delete "$INSTDIR\libgcrypt-11.dll"
@ -797,6 +802,7 @@ Section "Uninstall"
Delete "$INSTDIR\libgthread-2.0-0.dll"
Delete "$INSTDIR\liblastfm.dll"
Delete "$INSTDIR\libmms-0.dll"
Delete "$INSTDIR\libmp3lame-0.dll"
Delete "$INSTDIR\libogg-0.dll"
Delete "$INSTDIR\liboil-0.3-0.dll"
Delete "$INSTDIR\libsoup-2.4-1.dll"
@ -827,12 +833,14 @@ Section "Uninstall"
Delete "$INSTDIR\gstreamer-plugins\libgstcoreelements.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstdecodebin2.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstdirectsoundsink.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstfaac.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstfaad.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstffmpeg-gpl.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstflac.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstgio.dll"
Delete "$INSTDIR\gstreamer-plugins\libgsticydemux.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstid3demux.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstlame.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstmad.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstmms.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstogg.dll"

2
src/transcoder/transcoder.cpp
View File

@ -256,7 +256,7 @@ bool Transcoder::StartJob(const Job &job) {
// Create all the elements
const TranscoderFormat* f = job.output_format;
GstElement* src = CreateElement("filesrc", state->pipeline_.get());
GstElement* decode = CreateElement("decodebin", state->pipeline_.get());
GstElement* decode = CreateElement("decodebin2", state->pipeline_.get());
GstElement* convert = CreateElement("audioconvert", state->pipeline_.get());
GstElement* encode = CreateBin(f->gst_elements());
GstElement* sink = CreateElement("filesink", state->pipeline_.get());