diff options
| -rw-r--r-- | src/plugins/Input/aac/decoder_aac.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/Input/flac/decoder_flac.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/mad/decoder_mad.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/Input/mpc/decoder_mpc.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/Input/opus/decoder_opus.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/Input/vorbis/decoder_vorbis.cpp | 10 |
6 files changed, 4 insertions, 48 deletions
diff --git a/src/plugins/Input/aac/decoder_aac.cpp b/src/plugins/Input/aac/decoder_aac.cpp index 049802261..657833c85 100644 --- a/src/plugins/Input/aac/decoder_aac.cpp +++ b/src/plugins/Input/aac/decoder_aac.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2012 by Ilya Kotov * + * Copyright (C) 2006-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -74,14 +74,6 @@ bool DecoderAAC::initialize() m_input_buf = new char[AAC_BUFFER_SIZE]; m_input_at = 0; - if (!input()->isOpen()) - { - if (!input()->open(QIODevice::ReadOnly)) - { - qWarning("DecoderAAC: %s", qPrintable(input()->errorString ())); - return false; - } - } AACFile aac_file(input()); if (!aac_file.isValid()) { diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp index e2f274b12..96868de6a 100644 --- a/src/plugins/Input/flac/decoder_flac.cpp +++ b/src/plugins/Input/flac/decoder_flac.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2014 by Ilya Kotov * + * Copyright (C) 2006-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Input/mad/decoder_mad.cpp b/src/plugins/Input/mad/decoder_mad.cpp index 79e266ed5..57924f620 100644 --- a/src/plugins/Input/mad/decoder_mad.cpp +++ b/src/plugins/Input/mad/decoder_mad.cpp @@ -75,15 +75,6 @@ bool DecoderMAD::initialize() if (!m_input_buf) m_input_buf = new char[INPUT_BUFFER_SIZE]; - if (!input()->isOpen()) - { - if (!input()->open(QIODevice::ReadOnly)) - { - qWarning("DecoderMAD: %s", qPrintable(input()->errorString ())); - return false; - } - } - if (input()->isSequential ()) //for streams only { TagExtractor extractor(input()); diff --git a/src/plugins/Input/mpc/decoder_mpc.cpp b/src/plugins/Input/mpc/decoder_mpc.cpp index 0ce46ced4..1d273da66 100644 --- a/src/plugins/Input/mpc/decoder_mpc.cpp +++ b/src/plugins/Input/mpc/decoder_mpc.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2015 by Ilya Kotov * + * Copyright (C) 2006-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -125,14 +125,6 @@ bool DecoderMPC::initialize() return false; } - if (!input()->isOpen()) - { - if (!input()->open(QIODevice::ReadOnly)) - { - qWarning("DecoderMPC: unable to open input."); - return false; - } - } if (!m_data) { m_data = new mpc_data; diff --git a/src/plugins/Input/opus/decoder_opus.cpp b/src/plugins/Input/opus/decoder_opus.cpp index 0441e944c..7823337c8 100644 --- a/src/plugins/Input/opus/decoder_opus.cpp +++ b/src/plugins/Input/opus/decoder_opus.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2015 by Ilya Kotov * + * Copyright (C) 2013-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -93,15 +93,6 @@ bool DecoderOpus::initialize() return false; } - if (!input()->isOpen()) - { - if (!input()->open(QIODevice::ReadOnly)) - { - qWarning("DecoderOpus: unable to open input. Error: %s",qPrintable(input()->errorString())); - return false; - } - } - OpusFileCallbacks opuscb = { opusread, diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp index 765572c91..13e7dbab4 100644 --- a/src/plugins/Input/vorbis/decoder_vorbis.cpp +++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp @@ -95,16 +95,6 @@ bool DecoderVorbis::initialize() return false; } - if (!input()->isOpen()) - { - if (!input()->open(QIODevice::ReadOnly)) - { - qWarning("%s",qPrintable("DecoderVorbis: failed to open input. " + - input()->errorString () + ".")); - return false; - } - } - ov_callbacks oggcb = { oggread, |