[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/multimedia/audex/kcdda
From:       Marco Nelles <marconelles () gmx ! de>
Date:       2010-02-08 18:53:11
Message-ID: 1265655191.788598.4800.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1087281 by marcon:

KCDDA changes.

 M  +5 -1      kcdda_controller.cpp  
 M  +5 -0      kcdda_controller.h  
 M  +4 -4      kcdda_info.cpp  
 M  +2 -2      kcdda_opticalaudiodiscmodel.cpp  
 M  +6 -6      kcdda_paranoia.cpp  


--- trunk/playground/multimedia/audex/kcdda/kcdda_controller.cpp #1087280:1087281
@@ -27,6 +27,8 @@
   connect(&p_audiodiscmodel, SIGNAL(audioDiscDetected(const QModelIndex&, const \
QString&)), this, SLOT(p_audiodisc_detected(const QModelIndex&, const QString&)));  \
connect(&p_audiodiscmodel, SIGNAL(audioDiscRemoved(const QString&)), this, \
SLOT(p_audiodisc_removed(const QString&)));  
+  p_audiodiscmodel.scanBus();
+
   connect(&p_cddb, SIGNAL(lookupFinished(bool)), this, \
SLOT(p_cddb_lookup_finished(bool)));  
   p_auto_cddb_lookup = FALSE;
@@ -61,6 +63,8 @@
 
 void KCDDA_Controller::p_cddb_lookup_finished(bool successful) {
   p_last_lookup_model->unlock();
-  p_last_lookup_model->
+  if (successful) {
+    p_last_lookup_model->confirm();
+  }
   p_last_lookup_model = NULL;
 }
--- trunk/playground/multimedia/audex/kcdda/kcdda_controller.h #1087280:1087281
@@ -35,6 +35,11 @@
   KCDDA_Controller(QObject *parent = 0);
   ~KCDDA_Controller();
 
+  inline KCDDA_OpticalAudioDiscModel* opticalAudioDiscModel() { return \
&p_audiodiscmodel; } +
+  inline void setAutoCDDBLookup(const bool enabled = TRUE) { p_auto_cddb_lookup = \
enabled; } +  inline bool autoCDDBLookup() const { return p_auto_cddb_lookup; }
+
 signals:
   void audioDiscDetected(KCDDA_InfoModel *model);
 
--- trunk/playground/multimedia/audex/kcdda/kcdda_info.cpp #1087280:1087281
@@ -122,11 +122,11 @@
   p_modify();
 }
 
-bool KCDDA_Info::isModified(ModifiedType type = All) const {
+bool KCDDA_Info::isModified(ModifiedType type) const {
   for (int i = 0; i < p_tracks.count(); ++i) if (p_tracks.at(i).isModified()) return \
TRUE;  switch (type) {
     case CDDBRelevant : return p_modified_cddb_rel;
-    case All :
+    case All : ;
   }
   return p_modified;
 }
@@ -291,10 +291,10 @@
   set(Revision, get(Revision).toInt()+1);
 }
 
-void KCDDA_Info::p_modify(ModifiedType type = All) {
+void KCDDA_Info::p_modify(ModifiedType type) {
   switch (type) {
     case CDDBRelevant : p_modified_cddb_rel = TRUE;
-    case All :
+    case All : ;
   }
   p_modified = TRUE;
 }
--- trunk/playground/multimedia/audex/kcdda/kcdda_opticalaudiodiscmodel.cpp \
#1087280:1087281 @@ -104,7 +104,7 @@
   return QVariant();
 }
 
-const QString KCDDA_OpticalAudioDiscModel::udi(const QModelIndex &index);
+const QString KCDDA_OpticalAudioDiscModel::udi(const QModelIndex &index) {
 
   if (!index.isValid()) {
     return NULL;
@@ -118,7 +118,7 @@
 
 }
 
-const QString KCDDA_OpticalAudioDiscModel::blockDevice(const QModelIndex &index);
+const QString KCDDA_OpticalAudioDiscModel::blockDevice(const QModelIndex &index) {
 
   if (!index.isValid()) {
     return NULL;
--- trunk/playground/multimedia/audex/kcdda/kcdda_paranoia.cpp #1087280:1087281
@@ -36,9 +36,9 @@
 }
 
 bool KCDDA_Paranoia::setBlockDevice(const QString& blockDevice) {
-  kDebug() << device;
+  kDebug() << blockDevice;
   if ((blockDevice.isEmpty() && (p_block_device.isEmpty()))) p_block_device = \
                "/dev/cdrom";
-  if (!blockDevice.isEmpty()) p_block_device = device;
+  if (!blockDevice.isEmpty()) p_block_device = blockDevice;
   if (!p_paranoia_init()) {
     kDebug() << "Internal device error.";
     emit error(i18n("Internal device error."), i18n("Check your device. Is it really \
\"%1\"? If so also check your permissions on \"%1\".", p_block_device)); @@ -66,7 \
+66,7 @@  
   if (p_paranoia_never_skip) p_paranoia_mode |= PARANOIA_MODE_NEVERSKIP;
 
-  if (p_paranoia) p_paranoia_modeset(p_paranoia, p_paranoia_mode);
+  if (p_paranoia) paranoia_modeset(p_paranoia, p_paranoia_mode);
 
   p_mutex.unlock();
 
@@ -193,7 +193,7 @@
     if (n == numOfTracks()) {
       return numOfFrames()-p_paranoia_drive->disc_toc[n-1].dwStartSector;
     } else {
-      return paranoia_drive->disc_toc[n].dwStartSector-p_paranoia_drive->disc_toc[n-1].dwStartSector;
 +      return p_paranoia_drive->disc_toc[n].dwStartSector-p_paranoia_drive->disc_toc[n-1].dwStartSector;
  }
 
   }
@@ -228,7 +228,7 @@
 quint32 KCDDA_Paranoia::discid() {
   quint32 cksum = 0;
   for (int i = 1; i <= numOfTracks(); i++) {
-    cksum += checksum((frameOffsetOfTrack(i)+150) / 75);
+    cksum += p_checksum((frameOffsetOfTrack(i)+150) / 75);
   }
   return ((cksum % 0xff) << 24 | length() << 8 | numOfTracks());
 }
@@ -252,7 +252,7 @@
 
   //cdda_cdda_verbose_set(_drive, 1, 1);
 
-  cdda_open(paranoia_drive);
+  cdda_open(p_paranoia_drive);
   p_paranoia = paranoia_init(p_paranoia_drive);
   if (p_paranoia == 0) {
     p_paranoia_free();


[prev in list] [next in list] [prev in thread] [next in thread]