← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kradio/utopic

« back to all changes in this revision

Viewing changes to kradio3/plugins/streaming/streaming.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Marc 'HE' Brockschmidt
  • Date: 2008-03-16 19:00:02 UTC
  • mfrom: (3.1.2 gutsy)
  • Revision ID: james.westby@ubuntu.com-20080316190002-sdjqu8cahhx7c6tk
Tags: 0.1.1.1~20061112-3.1
http://bugs.debian.org/455390
* Non-maintainer upload.
* Fix gcc-4.3 FTBFS, patch by Kibi (Closes: #455390)

Show diffs side-by-side

added added

removed removed

Lines of Context:
kradio3/plugins/streaming/streaming.cpp
17
17
 
18
18
#include "streaming.h"
19
19
 
20
 
#include "../../src/libkradio-gui/aboutwidget.h"
21
 
#include "../../src/libkradio/utils.h"
 
20
#include "../../src/include/aboutwidget.h"
 
21
#include "../../src/include/utils.h"
22
22
#include <klocale.h>
23
23
#include <kaboutdata.h>
24
24
#include <kurl.h>
 
25
#include <klocale.h>
25
26
 
26
27
#include "streaming-job.h"
27
28
#include "streaming-configuration.h"
29
30
///////////////////////////////////////////////////////////////////////
30
31
//// plugin library functions
31
32
 
32
 
PLUGIN_LIBRARY_FUNCTIONS(StreamingDevice, "Streaming Support");
 
33
PLUGIN_LIBRARY_FUNCTIONS(StreamingDevice, "kradio-streaming", i18n("Streaming Support"));
33
34
 
34
35
/////////////////////////////////////////////////////////////////////////////
35
36
 
127
128
{
128
129
    c->setGroup(QString("streaming-") + PluginBase::name());
129
130
    setSoundStreamClientID(c->readEntry("soundstreamclient-id", getSoundStreamClientID()));
130
 
    
 
131
 
131
132
    resetPlaybackStreams(false);
132
133
    resetCaptureStreams(false);
133
134
 
389
390
        const char   *buffer        = NULL;
390
391
        size_t        size          = SIZE_T_DONT_CARE;
391
392
        size_t        consumed_size = SIZE_T_DONT_CARE;
392
 
        SoundMetaData meta_data(0,0,0, QString::null);
 
393
        SoundMetaData meta_data(0,0,0, i18n("internal stream, not stored (%1)").arg(m_AllCaptureStreams[id]));
393
394
        x.lockData(buffer, size, meta_data); // get pointer to data and meta-data content
394
395
        if (size > free_size)
395
396
            size = free_size;
522
523
}
523
524
 
524
525
 
 
526
#include "streaming.moc"