summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/encoders.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/encoders.cpp')
-rw-r--r--rbutil/rbutilqt/encoders.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/rbutil/rbutilqt/encoders.cpp b/rbutil/rbutilqt/encoders.cpp
index dcd0e13c6d..a822b932f7 100644
--- a/rbutil/rbutilqt/encoders.cpp
+++ b/rbutil/rbutilqt/encoders.cpp
@@ -56,7 +56,7 @@ EncBase* EncBase::getEncoder(QString encoder)
56 return encoderCache.value(encoder); 56 return encoderCache.value(encoder);
57 57
58 EncBase* enc; 58 EncBase* enc;
59 if(encoder == "lame") 59 if(encoder == "lame")
60 { 60 {
61 enc = new EncExes(encoder); 61 enc = new EncExes(encoder);
62 encoderCache[encoder] = enc; 62 encoderCache[encoder] = enc;
@@ -99,8 +99,8 @@ EncExes::EncExes(QString name,QObject *parent) : EncBase(parent)
99 99
100bool EncExes::start() 100bool EncExes::start()
101{ 101{
102 m_EncExec = settings->encoderPath(m_name); 102 m_EncExec = settings->subValue(m_name, RbSettings::EncoderPath).toString();
103 m_EncOpts = settings->encoderOptions(m_name); 103 m_EncOpts = settings->subValue(m_name, RbSettings::EncoderOptions).toString();
104 104
105 m_EncTemplate = m_TemplateMap.value(m_name); 105 m_EncTemplate = m_TemplateMap.value(m_name);
106 106
@@ -144,7 +144,7 @@ void EncExes::showCfg()
144 144
145bool EncExes::configOk() 145bool EncExes::configOk()
146{ 146{
147 QString path = settings->encoderPath(m_name); 147 QString path = settings->subValue(m_name, RbSettings::EncoderPath).toString();
148 148
149 if (QFileInfo(path).exists()) 149 if (QFileInfo(path).exists())
150 return true; 150 return true;
@@ -171,10 +171,10 @@ bool EncRbSpeex::start()
171{ 171{
172 172
173 // try to get config from settings 173 // try to get config from settings
174 quality = settings->encoderQuality("rbspeex"); 174 quality = settings->subValue("rbspeex", RbSettings::EncoderQuality).toDouble();
175 complexity = settings->encoderComplexity("rbspeex"); 175 complexity = settings->subValue("rbspeex", RbSettings::EncoderComplexity).toInt();
176 volume = settings->encoderVolume("rbspeex"); 176 volume = settings->subValue("rbspeex", RbSettings::EncoderVolume).toDouble();
177 narrowband = settings->encoderNarrowband("rbspeex"); 177 narrowband = settings->subValue("rbspeex", RbSettings::EncoderNarrowBand).toBool();
178 178
179 179
180 return true; 180 return true;
@@ -227,13 +227,13 @@ bool EncRbSpeex::configOk()
227 bool result=true; 227 bool result=true;
228 // check config 228 // check config
229 229
230 if(settings->encoderVolume("rbspeex") <= 0) 230 if(settings->subValue("rbspeex", RbSettings::EncoderVolume).toDouble() <= 0)
231 result =false; 231 result =false;
232 232
233 if(settings->encoderQuality("rbspeex") <= 0) 233 if(settings->subValue("rbspeex", RbSettings::EncoderQuality).toDouble() <= 0)
234 result =false; 234 result =false;
235 235
236 if(settings->encoderComplexity("rbspeex") <= 0) 236 if(settings->subValue("rbspeex", RbSettings::EncoderComplexity).toInt() <= 0)
237 result =false; 237 result =false;
238 238
239 return result; 239 return result;