File 4_4_BRANCH.diff of Package kdemultimedia4

Overview Repositories Revisions Requests Users Attributes Meta

File 4_4_BRANCH.diff of Package kdemultimedia4 (Revision d38fabc04d9b32c23d76c8384f64f4e3)

Currently displaying revision d38fabc04d9b32c23d76c8384f64f4e3 , Show latest

package: kdemultimedia-4.4.3.tar.bz2
kdemod: kdemultimedia
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 1127686
+svn di between //tags/KDE/4.4.3/kdemultimedia and //branches/KDE/4.4/kdemultimedia
--- strigi-analyzer/mpc/kfile_mpc.desktop	
+++ strigi-analyzer/mpc/kfile_mpc.desktop	
@@ -55,7 +55,7 @@
 Name[sv]=Musepack-information
 Name[ta]=MP3 தகவல்
 Name[th]=ข้อมูล Musepack
-Name[tr]=MusePack Bilgisi
+Name[tr]=Musepack Bilgisi
 Name[uk]=Інформація по Musepack
 Name[wa]=Informåcions Musepack
 Name[x-test]=xxMusepack Infoxx
--- dragonplayer/misc/dragonplayer_play_dvd.desktop	
+++ dragonplayer/misc/dragonplayer_play_dvd.desktop	
@@ -51,7 +51,7 @@
 Name[sr@latin]=Pusti DVD Zmajevim plejerom
 Name[sv]=Spela dvd med Dragon videospelare
 Name[th]=เล่นแผ่นดีวีดีด้วยโปรแกรมเล่นสื่อ Dragon Player
-Name[tr]=DVDyi Dragon Player ile Oynat
+Name[tr]=DVD'yi Dragon Player ile Oynat
 Name[uk]=Грати DVD програвачем Dragon
 Name[wa]=Djouwer plake DVD avou l' Djouweu Dragon
 Name[x-test]=xxPlay DVD with Dragon Playerxx
--- juk/main.cpp	
+++ juk/main.cpp	
@@ -51,7 +51,7 @@
                          "http://developer.kde.org/~wheeler/juk.html");
 
     aboutData.addAuthor(ki18n("Scott Wheeler"), ki18n(scott), "wheeler@kde.org");
-    aboutData.addAuthor(ki18n("Michael Pyne"), ki18n(michael), "michael.pyne@kdemail.net");
+    aboutData.addAuthor(ki18n("Michael Pyne"), ki18n(michael), "mpyne@kde.org");
     aboutData.addCredit(ki18n("Daniel Molkentin"), ki18n(daniel), "molkentin@kde.org");
     aboutData.addCredit(ki18n("Tim Jansen"), ki18n(tim), "tim@tjansen.de");
     aboutData.addCredit(ki18n("Stefan Asserhäll"), ki18n(stefan), "stefan.asserhall@telia.com");
--- mplayerthumbs/src/videopreview.desktop	
+++ mplayerthumbs/src/videopreview.desktop	
@@ -24,7 +24,7 @@
 Name[ko]=비디오 파일 (MPlayerThumbs)
 Name[lv]=Video faili (MPlayerThumbs)
 Name[nb]=Videofiler (Mplayer minibilder)
-Name[nds]=Videodatein (MPlayer-Vöransichten)
+Name[nds]=Videodateien (MPlayer-Vöransichten)
 Name[nl]=Videobestanden (MPlayer-miniaturen)
 Name[nn]=Videofiler (MPlayerThumbs)
 Name[pa]=ਵਿਡੀਓ ਫਾਇਲਾਂ (MPlayerThumbs)
--- kmix/mixertoolbox.h	
+++ kmix/mixertoolbox.h	
@@ -53,6 +53,7 @@
       
       Mixer* find( const QString& mixer_id);
       GUIProfile* selectProfile(Mixer*);
+      GUIProfile* fallbackProfile(Mixer*);
       //static KLocale* whatsthisControlLocale();
       
    signals:
@@ -60,7 +61,7 @@
 
    private:
       static MixerToolBox* s_instance;
-      static GUIProfile*   s_fallbackProfile;
+      static QMap<Mixer*,GUIProfile*> s_fallbackProfiles;
       QMap<QString,int> s_mixerNums;
       static QRegExp s_ignoreMixerExpression;
       
--- kmix/mixertoolbox.cpp	
+++ kmix/mixertoolbox.cpp	
@@ -37,7 +37,7 @@
 
 
 MixerToolBox* MixerToolBox::s_instance      = 0;
-GUIProfile*   MixerToolBox::s_fallbackProfile = 0;
+QMap<Mixer*,GUIProfile*> MixerToolBox::s_fallbackProfiles;
 QRegExp MixerToolBox::s_ignoreMixerExpression("Modem");
 //KLocale* MixerToolBox::s_whatsthisLocale = 0;
 
@@ -112,7 +112,8 @@
    for( int drv=0; drv<drvNum; drv++ )
    {
       QString driverName = Mixer::driverName(drv);
-   
+      kDebug(67100) << "Looking for mixers with the : " << driverName << " driver";
+
       if ( autodetectionFinished ) {
          // inner loop indicates that we are finished => sane exit from outer loop
          break;
@@ -136,31 +137,33 @@
                 autodetectionFinished = true; // highest device number of driver and a Mixer => finished
         }
       
-         // append driverName (used drivers)
-         if ( mixerAccepted && !drvInfoAppended )
-         {
-            drvInfoAppended = true;
-            QString driverName = Mixer::driverName(drv);
-            if (  Mixer::mixers().count() > 1) {
-               driverInfoUsed += " + ";
-            }
-            driverInfoUsed += driverName;
-         }
-      
-         // Check whether there are mixers in different drivers, so that the user can be warned
-         if (mixerAccepted && !multipleDriversActive)
+         if ( mixerAccepted )
          {
-            if ( driverWithMixer == -1 )
+            kDebug(67100) << "Success! Found a mixer with the : " << driverName << " driver";
+            // append driverName (used drivers)
+            if ( !drvInfoAppended )
             {
-               // Aha, this is the very first detected device
-               driverWithMixer = drv;
+               drvInfoAppended = true;
+               if (  Mixer::mixers().count() > 1)
+                  driverInfoUsed += " + ";
+               driverInfoUsed += driverName;
             }
-            else if ( driverWithMixer != drv )
+
+            // Check whether there are mixers in different drivers, so that the user can be warned
+            if ( !multipleDriversActive )
             {
-                // Got him: There are mixers in different drivers
-                multipleDriversActive = true;
-            }
-         } //  !multipleDriversActive
+               if ( driverWithMixer == -1 )
+               {
+                  // Aha, this is the very first detected device
+                  driverWithMixer = drv;
+               }
+               else if ( driverWithMixer != drv )
+               {
+                   // Got him: There are mixers in different drivers
+                   multipleDriversActive = true;
+               }
+            } //  !multipleDriversActive
+         } // mixerAccepted
       
       } // loop over sound card devices of current driver
 
@@ -357,9 +360,13 @@
    
    QString userProfileDir = KStandardDirs::locateLocal("appdata", "profiles/" );
 
+   QString mixerNameSpacesToUnderscores = mixer->baseName();
+   mixerNameSpacesToUnderscores.replace(" ","_");
+
    // (1) User profile Directory
    QDir dir(userProfileDir);
    dir.setFilter(QDir::Files);
+   dir.setNameFilters(QStringList(mixer->getDriverName() + "." + mixerNameSpacesToUnderscores + "*.xml"));
    QFileInfoList fileList = dir.entryInfoList();
 
    QString fileNamePrefix = "profiles/" + mixer->getDriverName() + ".";
@@ -369,39 +376,34 @@
    QString fileNameFQ;
    fileNameFQ = KStandardDirs::locate("appdata", fileName );
 kDebug() << fileName << "; fnfq1=" << fileNameFQ;
-   QFileInfo qfi1(fileNameFQ);
-   fileList.insert(0, qfi1);
+   if (!fileNameFQ.isEmpty())
+       fileList.insert(0, QFileInfo(fileNameFQ));
 
    // (3) Soundcard specific profile (usually from system Directory)
-   QString mixerNameSpacesToUnderscores = mixer->baseName();
-   mixerNameSpacesToUnderscores.replace(" ","_");
    fileName = fileNamePrefix + mixerNameSpacesToUnderscores + ".xml";
    fileNameFQ = KStandardDirs::locate("appdata", fileName );
 kDebug() << fileName << "; fnfq2=" << fileNameFQ;
-   QFileInfo qfi2(fileNameFQ);
-   fileList.insert(0, qfi2);  
+   if (!fileNameFQ.isEmpty())
+      fileList.insert(0, QFileInfo(fileNameFQ));
 
 
 
 	for (int i = 0; i < fileList.size(); ++i) {
 		QFileInfo fileInfo = fileList.at(i);
-		kDebug() << i << ": Check user profile " << fileInfo.fileName() ;
-		if ( QDir::match( "*.xml", fileInfo.fileName() ) ) {
-			QString fileNameAbs = fileInfo.absoluteFilePath();
-			QString fileNameRelToProfile = "profiles/" + fileInfo.fileName();
-			kDebug() << i << ": Try user profile " << fileNameAbs;
-			GUIProfile* guiprofTemp = new GUIProfile();
-			if ( guiprofTemp->readProfile(fileNameAbs, fileNameRelToProfile) ) {
-				matchValueTemp = guiprofTemp->match(mixer);
-				if ( matchValueTemp < matchValueBest ) {
-					delete guiprofTemp;
-					guiprofTemp = 0;
-					matchValueTemp = 0;
-				}
-				else {
-					guiprofBest = guiprofTemp;
-					matchValueBest = matchValueTemp;
-				}
+		QString fileNameAbs = fileInfo.absoluteFilePath();
+		QString fileNameRelToProfile = "profiles/" + fileInfo.fileName();
+		kDebug() << i << ": Try user profile " << fileNameAbs;
+		GUIProfile* guiprofTemp = new GUIProfile();
+		if ( guiprofTemp->readProfile(fileNameAbs, fileNameRelToProfile) ) {
+			matchValueTemp = guiprofTemp->match(mixer);
+			if ( matchValueTemp < matchValueBest ) {
+				delete guiprofTemp;
+				guiprofTemp = 0;
+				matchValueTemp = 0;
+			}
+			else {
+				guiprofBest = guiprofTemp;
+				matchValueBest = matchValueTemp;
 			}
 		}
 	}
@@ -411,33 +413,40 @@
       // Still no profile found. This should usually not happen. This means one of the following things:
       // a) The KMix installation is not OK
       // b) The user has a defective profile in ~/.kde/share/apps/kmix/profiles/
-      // c) It is a Backend that ships no default profile (currently this is only Mixer_SUN)
-      if ( s_fallbackProfile == 0 ) {
-         s_fallbackProfile = new GUIProfile();
-
-         ProfProduct* prd = new ProfProduct();
-         prd->vendor         = mixer->getDriverName();
-         prd->productName    = mixer->readableName();
-         prd->productRelease = "1.0";
-         s_fallbackProfile->_products.insert(prd);
-
-         ProfControl* ctl = new ProfControl();
-         ctl->id          = ".*";
-         ctl->regexp      = ".*";   // make sure id matches the regexp
-         ctl->subcontrols = ".*";
-         ctl->show        = "simple";
-         s_fallbackProfile->_controls.push_back(ctl);
-
-         s_fallbackProfile->_soundcardDriver = mixer->getDriverName();
-         s_fallbackProfile->_soundcardName   = mixer->readableName();
-
-         s_fallbackProfile->finalizeProfile();
-      }
-      guiprofBest = s_fallbackProfile;
+      // c) It is a Backend that ships no default profile (currently this is only Mixer_SUN and Mixer_PULSE)
+      guiprofBest = fallbackProfile(mixer);
    }
 //    kDebug(67100) << "New Best    =" << matchValueBest << " pointer=" << guiprofBest << "\n";
 
    return guiprofBest;
 }
 
+
+GUIProfile* MixerToolBox::fallbackProfile(Mixer *mixer)
+{
+   if ( ! s_fallbackProfiles.contains(mixer) ) {
+      GUIProfile *fallback = new GUIProfile();
+
+      ProfProduct* prd = new ProfProduct();
+      prd->vendor         = mixer->getDriverName();
+      prd->productName    = mixer->readableName();
+      prd->productRelease = "1.0";
+      fallback->_products.insert(prd);
+
+      ProfControl* ctl = new ProfControl();
+      ctl->id          = ".*";
+      ctl->regexp      = ".*";   // make sure id matches the regexp
+      ctl->subcontrols = ".*";
+      ctl->show        = "simple";
+      fallback->_controls.push_back(ctl);
+
+      fallback->_soundcardDriver = mixer->getDriverName();
+      fallback->_soundcardName   = mixer->readableName();
+
+      fallback->finalizeProfile();
+      s_fallbackProfiles[mixer] = fallback;
+   }
+   return s_fallbackProfiles[mixer];
+}
+
 #include "mixertoolbox.moc"

Property changes on: .
___________________________________________________________________
Added: svn:externals
   +

Places

File 4_4_BRANCH.diff of Package kdemultimedia4 (Revision d38fabc04d9b32c23d76c8384f64f4e3)

Places