Commit edef6882 authored by Benjamin Meyer's avatar Benjamin Meyer
Browse files

Small function name change to conform to the rest of KDE

::easier for new developers to read::

svn path=/trunk/kdemultimedia/kioslave/audiocd/; revision=286148
parent 4141c3dc
......@@ -360,7 +360,7 @@ AudioCDProtocol::initRequest(const KURL & url)
}
// First get the parameters (settings).
getParameters();
loadSettings();
// Then these parameters can be overruled by args in the URL.
parseURLArgs(url);
......@@ -1084,8 +1084,7 @@ AudioCDProtocol::paranoiaRead(
paranoia = 0;
}
void AudioCDProtocol::getParameters() {
void AudioCDProtocol::loadSettings() {
KConfig *config;
config = new KConfig(QFL1("kcmaudiocdrc"));
......@@ -1111,7 +1110,7 @@ void AudioCDProtocol::getParameters() {
// Tell the encoders to load their settings
QMap<int, Encoder*>::Iterator it;
for ( it = encoders.begin(); it != encoders.end(); ++it )
it.data()->getParameters(config);
it.data()->loadSettings(config);
delete config;
}
......@@ -1123,4 +1122,3 @@ void paranoiaCallback(long, int)
// Why not?
}
// vim:ts=2:sw=2:tw=78:et:
......@@ -54,7 +54,7 @@ class AudioCDProtocol : public KIO::SlaveBase
struct cdrom_drive * findDrive(bool &noPermission);
void parseURLArgs(const KURL &);
void getParameters();
void loadSettings();
/**
* From the request information (Private member "d"),
......@@ -76,11 +76,15 @@ class AudioCDProtocol : public KIO::SlaveBase
*/
long fileSize(long firstSector, long lastSector, int encoder);
/**
* The heart of this ioslave.
* Reads data off the cd and then passes it to an encoder to encode
*/
void paranoiaRead(
struct cdrom_drive * drive,
long firstSector,
long lastSector,
int encoder
int encoderId
);
struct cdrom_drive * initRequest(const KURL &);
......@@ -113,4 +117,4 @@ class AudioCDProtocol : public KIO::SlaveBase
} // end namespace AudioCD
#endif // AUDIO_CD_H
// vim:ts=2:sw=2:tw=78:et:
......@@ -53,7 +53,7 @@ public:
* group.
* @param config pointer to active KConfig object.
*/
virtual void getParameters(KConfig *config) = 0;
virtual void loadSettings(KConfig *config) = 0;
/**
* Helper function to determine the end size of a
......
......@@ -41,7 +41,7 @@ public:
EncoderCda(KIO::SlaveBase *slave) : Encoder(slave) {};
~EncoderCda(){};
virtual bool init(){ return true; };
virtual void getParameters(KConfig *){};
virtual void loadSettings(KConfig *){};
virtual unsigned long size(long time_secs);
virtual QString type(){ return "CDA"; };
virtual const char * mimeType();
......
......@@ -363,7 +363,7 @@ bool EncoderLame::init(){
}
void EncoderLame::getParameters(KConfig *config){
void EncoderLame::loadSettings(KConfig *config){
if ( !init() )
return;
......
......@@ -41,7 +41,7 @@ public:
virtual QString type(){ return "MP3"; };
virtual bool init();
virtual void getParameters(KConfig *config);
virtual void loadSettings(KConfig *config);
virtual unsigned long size(long time_secs);
virtual const char * fileType(){ return "mp3"; };
virtual const char * mimeType();
......
......@@ -75,7 +75,7 @@ bool EncoderVorbis::init(){
return true;
}
void EncoderVorbis::getParameters(KConfig *config){
void EncoderVorbis::loadSettings(KConfig *config){
config->setGroup("Vorbis");
d->vorbis_encode_method = config->readNumEntry("encmethod", 0); // 0 for quality, 1 for managed bitrate
......
......@@ -44,7 +44,7 @@ public:
virtual QString type(){ return "Ogg Vorbis"; };
virtual bool init();
virtual void getParameters(KConfig *config);
virtual void loadSettings(KConfig *config);
virtual unsigned long size(long time_secs);
virtual const char * fileType(){ return "ogg"; };
virtual const char * mimeType();
......
......@@ -40,7 +40,7 @@ public:
EncoderWav(KIO::SlaveBase *slave) : EncoderCda(slave) {};
~EncoderWav(){};
virtual bool init(){ return true; };
virtual void getParameters(KConfig *){};
virtual void loadSettings(KConfig *){};
virtual unsigned long size(long time_secs);
virtual QString type(){ return "Wav"; };
virtual const char * fileType(){ return "wav"; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment