summaryrefslogtreecommitdiff
path: root/x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp')
-rw-r--r--x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp50
1 files changed, 0 insertions, 50 deletions
diff --git a/x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp b/x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp
deleted file mode 100644
index baba8f202aed..000000000000
--- a/x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/0xd34df00d/leechcraft/commit/307be1dd37059e49eca37f77ddc4806125a8f843
-https://github.com/0xd34df00d/leechcraft/commit/53d56cafd3a1d299601d9f3bfd4ee051ae9121ba
-https://github.com/0xd34df00d/leechcraft/commit/875e3b43b7a91656f61180b2b2179137f18e6d71
-https://github.com/0xd34df00d/leechcraft/commit/14f5f8823ec7b23fdb4409f4f689e565d8995536
-
---- plugins/musiczombie/chroma.cpp.orig 2014-07-28 18:35:44 UTC
-+++ plugins/musiczombie/chroma.cpp
-@@ -38,7 +38,6 @@ extern "C"
- {
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/opt.h>
- #include <libswresample/swresample.h>
-@@ -122,8 +121,8 @@ namespace MusicZombie
- auto remaining = maxLength * codecCtx->channels * codecCtx->sample_rate;
- chromaprint_start (Ctx_, codecCtx->sample_rate, codecCtx->channels);
-
-- std::shared_ptr<AVFrame> frame (avcodec_alloc_frame (),
-- [] (AVFrame *frame) { avcodec_free_frame (&frame); });
-+ std::shared_ptr<AVFrame> frame (av_frame_alloc (),
-+ [] (AVFrame *frame) { av_frame_free (&frame); });
- auto maxDstNbSamples = 0;
-
- uint8_t *dstData [1] = { nullptr };
-@@ -140,7 +139,7 @@ namespace MusicZombie
- if (packet.stream_index != streamIndex)
- continue;
-
-- avcodec_get_frame_defaults (frame.get ());
-+ av_frame_unref (frame.get ());
- int gotFrame = false;
- auto consumed = avcodec_decode_audio4 (codecCtx.get (), frame.get (), &gotFrame, &packet);
-
-@@ -168,7 +167,13 @@ namespace MusicZombie
- data = frame->data;
-
- auto length = std::min (remaining, frame->nb_samples * codecCtx->channels);
-- if (!chromaprint_feed (Ctx_, data [0], length))
-+ if (!chromaprint_feed (Ctx_,
-+#if CHROMAPRINT_VERSION_MAJOR > 1 || CHROMAPRINT_VERSION_MINOR >= 4
-+ reinterpret_cast<const int16_t*> (data [0]),
-+#else
-+ data [0],
-+#endif
-+ length))
- throw std::runtime_error ("cannot feed data");
-
- bool finished = false;