TDE
/
tdemultimedia
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KComp to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 3111786e2c
commit 09a22d33a2
7 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File

8
kaudiocreator/tracksimp.cpp
Unescape View File

@ -53,7 +53,7 @@ TracksImp::TracksImp( TQWidget* parent, const char* name) :
Tracks(parent,name), Tracks(parent,name),
cddbInfo() cddbInfo()
{ {
cd = new KCompactDisc; cd = new TDECompactDisc;
connect(cd,TQT_SIGNAL(discChanged(unsigned)),this,TQT_SLOT(newDisc(unsigned))); connect(cd,TQT_SIGNAL(discChanged(unsigned)),this,TQT_SLOT(newDisc(unsigned)));
@ -123,7 +123,7 @@ void TracksImp::loadSettings() {
void TracksImp::newDisc(unsigned discId) void TracksImp::newDisc(unsigned discId)
{ {
if (discId == KCompactDisc::missingDisc) if (discId == TDECompactDisc::missingDisc)
{ {
kdDebug() << "newDisc - No disc" << endl; kdDebug() << "newDisc - No disc" << endl;
cddbInfo.clear(); cddbInfo.clear();
@ -172,7 +172,7 @@ void TracksImp::newDisc(unsigned discId)
* @return if there is a cd inserted or not. * @return if there is a cd inserted or not.
*/ */
bool TracksImp::hasCD(){ bool TracksImp::hasCD(){
return cd->discId() != KCompactDisc::missingDisc; return cd->discId() != TDECompactDisc::missingDisc;
} }
/** /**
@ -180,7 +180,7 @@ bool TracksImp::hasCD(){
* @param file - the new text to check. * @param file - the new text to check.
*/ */
void TracksImp::changeDevice(const TQString &file ) { void TracksImp::changeDevice(const TQString &file ) {
TQString newDevice = KCompactDisc::urlToDevice(file); TQString newDevice = TDECompactDisc::urlToDevice(file);
if( newDevice == cd->device() ) { if( newDevice == cd->device() ) {
//tqDebug("Device names match, returning"); //tqDebug("Device names match, returning");

4
kaudiocreator/tracksimp.h
Unescape View File

@ -39,7 +39,7 @@
using namespace KCDDB; using namespace KCDDB;
class Job; class Job;
class TDEProcess; class TDEProcess;
class KCompactDisc; class TDECompactDisc;
class TracksItem : public TDEListViewItem class TracksItem : public TDEListViewItem
{ {
@ -128,7 +128,7 @@ private:
TQString formatTime(unsigned ms); TQString formatTime(unsigned ms);
KCDDB::Client *cddb; KCDDB::Client *cddb;
KCompactDisc *cd; TDECompactDisc *cd;
// Current album // Current album
KCDDB::CDInfo cddbInfo; KCDDB::CDInfo cddbInfo;

58
kscd/kcompactdisc.cpp
Unescape View File

@ -1,5 +1,5 @@
/* /*
* KCompactDisc - A CD drive interface for the KDE Project. * TDECompactDisc - A CD drive interface for the KDE Project.
* *
* Copyright (c) 2005 Shaheedur R. Haque <srhaque@iee.org> * Copyright (c) 2005 Shaheedur R. Haque <srhaque@iee.org>
* *
@ -94,10 +94,10 @@ extern "C"
#define TRACK_VALID(track) \ #define TRACK_VALID(track) \
((track) && (track <= m_tracks)) ((track) && (track <= m_tracks))
const TQString KCompactDisc::defaultDevice = DEFAULT_CD_DEVICE; const TQString TDECompactDisc::defaultDevice = DEFAULT_CD_DEVICE;
const unsigned KCompactDisc::missingDisc = (unsigned)-1; const unsigned TDECompactDisc::missingDisc = (unsigned)-1;
KCompactDisc::KCompactDisc(InformationMode infoMode) : TDECompactDisc::TDECompactDisc(InformationMode infoMode) :
m_device(TQString()), m_device(TQString()),
m_status(0), m_status(0),
m_previousStatus(123456), m_previousStatus(123456),
@ -117,7 +117,7 @@ KCompactDisc::KCompactDisc(InformationMode infoMode) :
connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerExpired())); connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerExpired()));
} }
KCompactDisc::~KCompactDisc() TDECompactDisc::~TDECompactDisc()
{ {
// Ensure nothing else starts happening. // Ensure nothing else starts happening.
timer.stop(); timer.stop();
@ -126,24 +126,24 @@ KCompactDisc::~KCompactDisc()
wm_cd_destroy(); wm_cd_destroy();
} }
const TQString &KCompactDisc::device() const const TQString &TDECompactDisc::device() const
{ {
return m_device; return m_device;
} }
unsigned KCompactDisc::discLength() const unsigned TDECompactDisc::discLength() const
{ {
if (NO_DISC || !m_tracks) if (NO_DISC || !m_tracks)
return 0; return 0;
return FRAMES_TO_MS(m_trackStartFrames[m_tracks+1] - m_trackStartFrames[0]); return FRAMES_TO_MS(m_trackStartFrames[m_tracks+1] - m_trackStartFrames[0]);
} }
unsigned KCompactDisc::discPosition() const unsigned TDECompactDisc::discPosition() const
{ {
return cur_pos_abs * 1000 - FRAMES_TO_MS(m_trackStartFrames[0]); return cur_pos_abs * 1000 - FRAMES_TO_MS(m_trackStartFrames[0]);
} }
TQString KCompactDisc::discStatus(int status) TQString TDECompactDisc::discStatus(int status)
{ {
TQString message; TQString message;
@ -192,7 +192,7 @@ TQString KCompactDisc::discStatus(int status)
/** /**
* Do everything needed if the user requested to eject the disc. * Do everything needed if the user requested to eject the disc.
*/ */
void KCompactDisc::eject() void TDECompactDisc::eject()
{ {
if (m_status == WM_CDM_EJECTED) if (m_status == WM_CDM_EJECTED)
{ {
@ -206,33 +206,33 @@ void KCompactDisc::eject()
} }
} }
unsigned KCompactDisc::track() const unsigned TDECompactDisc::track() const
{ {
return m_track; return m_track;
} }
bool KCompactDisc::isPaused() const bool TDECompactDisc::isPaused() const
{ {
return (m_status == WM_CDM_PAUSED); return (m_status == WM_CDM_PAUSED);
} }
bool KCompactDisc::isPlaying() const bool TDECompactDisc::isPlaying() const
{ {
return WM_CDS_DISC_PLAYING(m_status) && (m_status != WM_CDM_PAUSED) && (m_status != WM_CDM_TRACK_DONE); return WM_CDS_DISC_PLAYING(m_status) && (m_status != WM_CDM_PAUSED) && (m_status != WM_CDM_TRACK_DONE);
} }
void KCompactDisc::pause() void TDECompactDisc::pause()
{ {
// wm_cd_pause "does the right thing" by flipping between pause and resume. // wm_cd_pause "does the right thing" by flipping between pause and resume.
wm_cd_pause(); wm_cd_pause();
} }
void KCompactDisc::play(unsigned startTrack, unsigned startTrackPosition, unsigned endTrack) void TDECompactDisc::play(unsigned startTrack, unsigned startTrackPosition, unsigned endTrack)
{ {
wm_cd_play(TRACK_VALID(startTrack) ? startTrack : 1, startTrackPosition / 1000, TRACK_VALID(endTrack) ? endTrack : WM_ENDTRACK ); wm_cd_play(TRACK_VALID(startTrack) ? startTrack : 1, startTrackPosition / 1000, TRACK_VALID(endTrack) ? endTrack : WM_ENDTRACK );
} }
TQString KCompactDisc::urlToDevice(const TQString& device) TQString TDECompactDisc::urlToDevice(const TQString& device)
{ {
KURL deviceUrl(device); KURL deviceUrl(device);
if (deviceUrl.protocol() == "media" || deviceUrl.protocol() == "system") if (deviceUrl.protocol() == "media" || deviceUrl.protocol() == "system")
@ -256,7 +256,7 @@ TQString KCompactDisc::urlToDevice(const TQString& device)
return device; return device;
} }
bool KCompactDisc::setDevice( bool TDECompactDisc::setDevice(
const TQString &device_, const TQString &device_,
unsigned volume, unsigned volume,
bool digitalPlayback, bool digitalPlayback,
@ -304,64 +304,64 @@ bool KCompactDisc::setDevice(
return m_device != TQString(); return m_device != TQString();
} }
void KCompactDisc::setVolume(unsigned volume) void TDECompactDisc::setVolume(unsigned volume)
{ {
int status = wm_cd_volume(volume, WM_BALANCE_SYMMETRED); int status = wm_cd_volume(volume, WM_BALANCE_SYMMETRED);
kdDebug() << "Volume change: " << volume << ", status: " << discStatus(status) << endl; kdDebug() << "Volume change: " << volume << ", status: " << discStatus(status) << endl;
} }
void KCompactDisc::stop() void TDECompactDisc::stop()
{ {
wm_cd_stop(); wm_cd_stop();
} }
const TQString &KCompactDisc::trackArtist() const const TQString &TDECompactDisc::trackArtist() const
{ {
return trackArtist(m_track); return trackArtist(m_track);
} }
const TQString &KCompactDisc::trackArtist(unsigned track) const const TQString &TDECompactDisc::trackArtist(unsigned track) const
{ {
if (NO_DISC || !TRACK_VALID(track)) if (NO_DISC || !TRACK_VALID(track))
return TQString(); return TQString();
return m_trackArtists[track - 1]; return m_trackArtists[track - 1];
} }
unsigned KCompactDisc::trackLength() const unsigned TDECompactDisc::trackLength() const
{ {
return trackLength(m_track); return trackLength(m_track);
} }
unsigned KCompactDisc::trackLength(unsigned track) const unsigned TDECompactDisc::trackLength(unsigned track) const
{ {
if (NO_DISC || !TRACK_VALID(track)) if (NO_DISC || !TRACK_VALID(track))
return 0; return 0;
return cd->trk[track - 1].length * 1000; return cd->trk[track - 1].length * 1000;
} }
unsigned KCompactDisc::trackPosition() const unsigned TDECompactDisc::trackPosition() const
{ {
return cur_pos_rel * 1000; return cur_pos_rel * 1000;
} }
unsigned KCompactDisc::tracks() const unsigned TDECompactDisc::tracks() const
{ {
return m_tracks; return m_tracks;
} }
const TQString &KCompactDisc::trackTitle() const const TQString &TDECompactDisc::trackTitle() const
{ {
return trackTitle(m_track); return trackTitle(m_track);
} }
const TQString &KCompactDisc::trackTitle(unsigned track) const const TQString &TDECompactDisc::trackTitle(unsigned track) const
{ {
if (NO_DISC || !TRACK_VALID(track)) if (NO_DISC || !TRACK_VALID(track))
return TQString(); return TQString();
return m_trackTitles[track - 1]; return m_trackTitles[track - 1];
} }
bool KCompactDisc::isAudio(unsigned track) const bool TDECompactDisc::isAudio(unsigned track) const
{ {
if (NO_DISC || !TRACK_VALID(track)) if (NO_DISC || !TRACK_VALID(track))
return 0; return 0;
@ -374,7 +374,7 @@ bool KCompactDisc::isAudio(unsigned track) const
* - Data discs not recognized as data discs. * - Data discs not recognized as data discs.
* *
*/ */
void KCompactDisc::timerExpired() void TDECompactDisc::timerExpired()
{ {
m_status = wm_cd_status(); m_status = wm_cd_status();

12
kscd/kcompactdisc.h
Unescape View File

@ -1,5 +1,5 @@
/* /*
* KCompactDisc - A CD drive interface for the KDE Project. * TDECompactDisc - A CD drive interface for the KDE Project.
* *
* Copyright (c) 2005 Shaheedur R. Haque <srhaque@iee.org> * Copyright (c) 2005 Shaheedur R. Haque <srhaque@iee.org>
* *
@ -26,7 +26,7 @@
#include <tqvaluelist.h> #include <tqvaluelist.h>
/** /**
* KCompactDisc - A CD drive interface for the KDE Project. * TDECompactDisc - A CD drive interface for the KDE Project.
* *
* The disc lifecycle is modelled by these signals: * The disc lifecycle is modelled by these signals:
* *
@ -43,7 +43,7 @@
* All times in this interface are in milliseconds. Valid track numbers are * All times in this interface are in milliseconds. Valid track numbers are
* positive numbers; zero is not a valid track number. * positive numbers; zero is not a valid track number.
*/ */
class KCompactDisc : class TDECompactDisc :
public TQObject public TQObject
{ {
Q_OBJECT Q_OBJECT
@ -55,8 +55,8 @@ public:
Asynchronous // Block until cdrom and cddb infromation has been obtained Asynchronous // Block until cdrom and cddb infromation has been obtained
}; };
KCompactDisc(InformationMode=Synchronous); TDECompactDisc(InformationMode=Synchronous);
virtual ~KCompactDisc(); virtual ~TDECompactDisc();
/** /**
* Open/close tray. * Open/close tray.
@ -294,7 +294,7 @@ private:
unsigned m_previousTrack; unsigned m_previousTrack;
void checkDeviceStatus(); void checkDeviceStatus();
TQString discStatus(int status); TQString discStatus(int status);
class KCompactDiscPrivate *d; class TDECompactDiscPrivate *d;
InformationMode m_infoMode; InformationMode m_infoMode;
private slots: private slots:

14
kscd/kscd.cpp
Unescape View File

@ -98,7 +98,7 @@ KSCD::KSCD( TQWidget *parent, const char *name )
updateTime(true), updateTime(true),
m_dockWidget(0) m_dockWidget(0)
{ {
m_cd = new KCompactDisc(); m_cd = new TDECompactDisc();
cddbInfo.clear(); // The first freedb revision is "0" //!!!! cddbInfo.clear(); // The first freedb revision is "0" //!!!!
random_current = random_list.begin(); random_current = random_list.begin();
@ -379,7 +379,7 @@ void KSCD::setupPopups()
void KSCD::playClicked() void KSCD::playClicked()
{ {
if (m_cd->discId() == KCompactDisc::missingDisc) if (m_cd->discId() == TDECompactDisc::missingDisc)
return; return;
kapp->processEvents(); kapp->processEvents();
@ -801,7 +801,7 @@ void KSCD::setDevicePaths()
// This device did not seem usable. // This device did not seem usable.
TQString str = i18n("CD-ROM read or access error (or no audio disc in drive).\n"\ TQString str = i18n("CD-ROM read or access error (or no audio disc in drive).\n"\
"Please make sure you have access permissions to:\n%1").arg( "Please make sure you have access permissions to:\n%1").arg(
KCompactDisc::urlToDevice(Prefs::cdDevice())); TDECompactDisc::urlToDevice(Prefs::cdDevice()));
KMessageBox::error(this, str, i18n("Error")); KMessageBox::error(this, str, i18n("Error"));
} }
} // setDevicePath() } // setDevicePath()
@ -956,7 +956,7 @@ int KSCD::prev_randomtrack()
void KSCD::discChanged(unsigned discId) void KSCD::discChanged(unsigned discId)
{ {
cddbInfo.clear(); cddbInfo.clear();
if (discId == KCompactDisc::missingDisc) if (discId == TDECompactDisc::missingDisc)
{ {
statuslabel->setText(i18n("No disc")); statuslabel->setText(i18n("No disc"));
} }
@ -1018,7 +1018,7 @@ void KSCD::discChanged(unsigned discId)
void KSCD::discStopped() void KSCD::discStopped()
{ {
if (Prefs::ejectOnFinish() && !stoppedByUser && (m_cd->discId() != KCompactDisc::missingDisc)) if (Prefs::ejectOnFinish() && !stoppedByUser && (m_cd->discId() != TDECompactDisc::missingDisc))
{ {
ejectClicked(); ejectClicked();
} }
@ -1174,7 +1174,7 @@ void KSCD::CDDialogDone()
void KSCD::lookupCDDB() void KSCD::lookupCDDB()
{ {
if (m_cd->discId() == KCompactDisc::missingDisc) if (m_cd->discId() == TDECompactDisc::missingDisc)
return; return;
kdDebug(67000) << "lookupCDDB() called" << endl; kdDebug(67000) << "lookupCDDB() called" << endl;
@ -1319,7 +1319,7 @@ int KSCD::getStatus()
return 2; return 2;
else if (m_cd->isPaused()) else if (m_cd->isPaused())
return 4; return 4;
else if (m_cd->discId() != KCompactDisc::missingDisc) else if (m_cd->discId() != TDECompactDisc::missingDisc)
return 5; return 5;
else else
return 6; return 6;

4
kscd/kscd.h
Unescape View File

@ -28,7 +28,7 @@
#include "bwlednum.h" #include "bwlednum.h"
// CD support. // CD support.
class KCompactDisc; class TDECompactDisc;
// CDDB support via libkcddb // CDDB support via libkcddb
#include <libkcddb/cddb.h> #include <libkcddb/cddb.h>
@ -188,7 +188,7 @@ private:
BW_LED_Number *trackTimeLED[6]; BW_LED_Number *trackTimeLED[6];
KCompactDisc *m_cd; TDECompactDisc *m_cd;
TQTimer titlelabeltimer; TQTimer titlelabeltimer;
TQTimer queryledtimer; TQTimer queryledtimer;
TQTimer cycletimer; TQTimer cycletimer;

4
tdeioslave/audiocd/audiocd.cpp
Unescape View File

@ -104,7 +104,7 @@ enum Which_dir {
class AudioCDProtocol::Private { class AudioCDProtocol::Private {
public: public:
Private() : cd(KCompactDisc::Asynchronous) { Private() : cd(TDECompactDisc::Asynchronous) {
clearURLargs(); clearURLargs();
s_info = i18n("Information"); s_info = i18n("Information");
s_fullCD = i18n("Full CD"); s_fullCD = i18n("Full CD");
@ -137,7 +137,7 @@ public:
unsigned discid; unsigned discid;
unsigned tracks; unsigned tracks;
bool trackIsAudio[100]; bool trackIsAudio[100];
KCompactDisc cd; // keep it around so that we don't assume the disk changed between every stat() TDECompactDisc cd; // keep it around so that we don't assume the disk changed between every stat()
// CDDB items // CDDB items
KCDDB::CDDB::Result cddbResult; KCDDB::CDDB::Result cddbResult;

Write Preview
Loading…
Cancel
Save