← Back to branch summary

~mixxxdevelopers/mixxx/engine-control-refactor

« back to all changes in this revision

Viewing changes to mixxx/src/dlgprefrecord.cpp

  • Committer: RJ Ryan
  • Date: 2013-06-04 00:41:29 UTC
  • mfrom: (2890.22.101 mixxx)
  • Revision ID: rryan@mixxx.org-20130604004129-8jjxkicsb3givu4a
Merging from lp:mixxx.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/dlgprefrecord.cpp
17
17
 
18
18
#include <QtCore>
19
19
#include <QtGui>
 
20
 
20
21
#include "dlgprefrecord.h"
21
22
#include "recording/defs_recording.h"
22
23
#include "controlobject.h"
23
24
#include "controlobjectthreadmain.h"
24
 
#include "recording/encoder.h"
25
 
 
 
25
#include "encoder/encoder.h"
26
26
 
27
27
DlgPrefRecord::DlgPrefRecord(QWidget * parent, ConfigObject<ConfigValue> * _config)
28
28
        : QWidget(parent) {
39
39
    recordControl = new ControlObjectThreadMain(
40
40
        ControlObject::getControl(ConfigKey(RECORDING_PREF_KEY, "status")));
41
41
 
42
 
#ifdef __SHOUTCAST__
43
42
    radioOgg = new QRadioButton("Ogg Vorbis");
44
43
    radioMp3 = new QRadioButton(ENCODING_MP3);
45
44
 
46
45
    // Setting recordings path
47
 
    QString recordingsPath = config->getValueString(ConfigKey("[Recording]","Directory"));
 
46
    QString recordingsPath = config->getValueString(ConfigKey(RECORDING_PREF_KEY,"Directory"));
48
47
    if (recordingsPath == "") {
49
48
        // Initialize recordings path in config to old default path.
50
49
        // Do it here so we show current value in UI correctly.
67
66
    horizontalLayout->addWidget(radioOgg);
68
67
    horizontalLayout->addWidget(radioMp3);
69
68
 
70
 
#endif
71
 
 
72
69
    //AIFF and WAVE are supported by default
73
70
    radioWav = new QRadioButton(ENCODING_WAVE);
74
71
    connect(radioWav, SIGNAL(clicked()),
80
77
            this, SLOT(slotApply()));
81
78
    horizontalLayout->addWidget(radioAiff);
82
79
 
83
 
 
84
80
#ifdef SF_FORMAT_FLAC
85
81
    radioFlac = new QRadioButton(ENCODING_FLAC);
86
82
    connect(radioFlac,SIGNAL(clicked()),
89
85
#endif
90
86
 
91
87
    //Read config and check radio button
92
 
    QString format = config->getValueString(ConfigKey("[Recording]","Encoding"));
 
88
    QString format = config->getValueString(ConfigKey(RECORDING_PREF_KEY,"Encoding"));
93
89
    if(format == ENCODING_WAVE)
94
90
        radioWav->setChecked(true);
95
 
#ifdef __SHOUTCAST__
96
91
    else if(format == ENCODING_OGG)
97
92
        radioOgg->setChecked(true);
98
93
    else if (format == ENCODING_MP3)
99
94
        radioMp3->setChecked(true);
100
 
#endif
101
 
#ifdef SF_FORMAT_FLAC
102
95
    else if (format == ENCODING_AIFF)
103
96
        radioAiff->setChecked(true);
 
97
#ifdef SF_FORMAT_FLAC
 
98
    else if (format == ENCODING_FLAC)
 
99
        radioFlac->setChecked(true);
104
100
#endif
105
101
    else //Invalid, so set default and save
106
102
    {
109
105
        config->set(ConfigKey(RECORDING_PREF_KEY, "Encoding"), ConfigValue(ENCODING_WAVE));
110
106
    }
111
107
 
 
108
    loadMetaData();
 
109
 
112
110
    //Connections
113
111
    connect(SliderQuality,    SIGNAL(valueChanged(int)), this,  SLOT(slotSliderQuality()));
114
112
    connect(SliderQuality,    SIGNAL(sliderMoved(int)), this,   SLOT(slotSliderQuality()));
125
123
    comboBoxSplitting->addItem(SPLIT_2048MB);
126
124
    comboBoxSplitting->addItem(SPLIT_4096MB);
127
125
 
128
 
    QString fileSizeStr = config->getValueString(ConfigKey("[Recording]","FileSize"));
 
126
    QString fileSizeStr = config->getValueString(ConfigKey(RECORDING_PREF_KEY,"FileSize"));
129
127
    int index = comboBoxSplitting->findText(fileSizeStr);
130
128
    if(index > 0){
131
129
        //set file split size
134
132
    //Otherwise 650 MB will be default file split size
135
133
 
136
134
    //Read CUEfile info
137
 
    CheckBoxRecordCueFile->setChecked((bool) config->getValueString(ConfigKey("[Recording]","CueEnabled")).toInt());
 
135
    CheckBoxRecordCueFile->setChecked((bool) config->getValueString(ConfigKey(RECORDING_PREF_KEY,"CueEnabled")).toInt());
138
136
 
139
137
}
140
138
 
243
241
void DlgPrefRecord::slotUpdate()
244
242
{
245
243
    // Recordings path
246
 
    QString recordingsPath = config->getValueString(ConfigKey("[Recording]","Directory"));
 
244
    QString recordingsPath = config->getValueString(ConfigKey(RECORDING_PREF_KEY,"Directory"));
247
245
    LineEditRecordings->setText(recordingsPath);
248
246
 
249
247
    if (radioWav && radioWav->isChecked())
272
270
void DlgPrefRecord::slotBrowseRecordingsDir()
273
271
{
274
272
    QString fd = QFileDialog::getExistingDirectory(this, tr("Choose recordings directory"),
275
 
                                                   config->getValueString(ConfigKey("[Recording]","Directory")));
 
273
                                                   config->getValueString(ConfigKey(RECORDING_PREF_KEY,"Directory")));
276
274
    if (fd != "")
277
275
    {
278
276
        LineEditRecordings->setText(fd);
293
291
        qDebug() << "Recordings path was empty in dialog";
294
292
        return;
295
293
    }
296
 
    if (LineEditRecordings->text() != config->getValueString(ConfigKey("[Recording]","Directory")))
 
294
    if (LineEditRecordings->text() != config->getValueString(ConfigKey(RECORDING_PREF_KEY,"Directory")))
297
295
    {
298
296
        qDebug() << "Saved recordings path" << LineEditRecordings->text();
299
 
        config->set(ConfigKey("[Recording]","Directory"), LineEditRecordings->text());
 
297
        config->set(ConfigKey(RECORDING_PREF_KEY,"Directory"), LineEditRecordings->text());
300
298
    }
301
299
}
302
300