diff options
Diffstat (limited to 'rbutil/rbutilqt/encoders.cpp')
-rw-r--r-- | rbutil/rbutilqt/encoders.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/encoders.cpp b/rbutil/rbutilqt/encoders.cpp index 0077263df0..acc7e4ef9c 100644 --- a/rbutil/rbutilqt/encoders.cpp +++ b/rbutil/rbutilqt/encoders.cpp | |||
@@ -26,12 +26,13 @@ | |||
26 | #include "encodersguicli.h" | 26 | #include "encodersguicli.h" |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | static QMap<QString,QString> encoderList; | 29 | |
30 | static QMap<QString,EncBase*> encoderCache; | 30 | QMap<QString,QString> EncBase::encoderList; |
31 | QMap<QString,EncBase*> EncBase::encoderCache; | ||
31 | 32 | ||
32 | 33 | ||
33 | // initialize list of encoders | 34 | // initialize list of encoders |
34 | void initEncodernamesList() | 35 | void EncBase::initEncodernamesList() |
35 | { | 36 | { |
36 | encoderList["rbspeex"] = "Rockbox Speex Encoder"; | 37 | encoderList["rbspeex"] = "Rockbox Speex Encoder"; |
37 | encoderList["lame"] = "Lame Mp3 Encoder"; | 38 | encoderList["lame"] = "Lame Mp3 Encoder"; |
@@ -39,7 +40,7 @@ void initEncodernamesList() | |||
39 | 40 | ||
40 | 41 | ||
41 | // get nice name for a specific encoder | 42 | // get nice name for a specific encoder |
42 | QString getEncoderName(QString encoder) | 43 | QString EncBase::getEncoderName(QString encoder) |
43 | { | 44 | { |
44 | if(encoderList.isEmpty()) | 45 | if(encoderList.isEmpty()) |
45 | initEncodernamesList(); | 46 | initEncodernamesList(); |
@@ -48,7 +49,7 @@ QString getEncoderName(QString encoder) | |||
48 | 49 | ||
49 | 50 | ||
50 | // get a specific encoder object | 51 | // get a specific encoder object |
51 | EncBase* getEncoder(QString encoder) | 52 | EncBase* EncBase::getEncoder(QString encoder) |
52 | { | 53 | { |
53 | // check cache | 54 | // check cache |
54 | if(encoderCache.contains(encoder)) | 55 | if(encoderCache.contains(encoder)) |
@@ -70,7 +71,7 @@ EncBase* getEncoder(QString encoder) | |||
70 | } | 71 | } |
71 | 72 | ||
72 | 73 | ||
73 | QStringList getEncoderList() | 74 | QStringList EncBase::getEncoderList() |
74 | { | 75 | { |
75 | if(encoderList.isEmpty()) | 76 | if(encoderList.isEmpty()) |
76 | initEncodernamesList(); | 77 | initEncodernamesList(); |