← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kdeplasma-addons/trusty

« back to all changes in this revision

Viewing changes to applets/nowplaying/nowplaying.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2010-05-25 09:50:14 UTC
  • mfrom: (1.1.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20100525095014-6mlrm9z9bkws0zkt
Tags: 4:4.4.80-0ubuntu1
* New upstream beta release:
  - Bump kde-sc-dev-latest build-dep version to 4.4.80
  - Refresh kubuntu_04_kimpanel_disable_scim.diff
  - Update various .install files
  - Drop liblancelot0a and liblancelot-dev packages; Upstream has broken ABI
    without an .so version bump, and after discussion with Debian it was
    decided it was not worth it to ship an unstable library.
  - Add liblancelot files to plasma-widget-lancelot, adding appropriate
    Replaces: entries
* Switch to source format 3.0 (quilt):
  - Bump debhelper build-depend version to 7.3.16 or greater

Show diffs side-by-side

added added

removed removed

Lines of Context:
applets/nowplaying/nowplaying.cpp
317
317
        m_watchingPlayer = name;
318
318
 
319
319
        m_controller = dataEngine("nowplaying")->serviceForSource(m_watchingPlayer);
320
 
        m_controller->associateWidget(m_positionSlider, "seek");
321
 
        m_controller->associateWidget(m_volumeSlider, "volume");
 
320
        if (m_controller) {
 
321
            m_controller->associateWidget(m_positionSlider, "seek");
 
322
            m_controller->associateWidget(m_volumeSlider, "volume");
 
323
        }
 
324
 
322
325
        emit controllerChanged(m_controller);
323
 
 
324
326
        dataEngine("nowplaying")->connectSource(m_watchingPlayer, this, 500);
325
327
    }
326
328
}
351
353
        m_watchingPlayer = players.first();
352
354
 
353
355
        m_controller = dataEngine("nowplaying")->serviceForSource(m_watchingPlayer);
354
 
        m_controller->associateWidget(m_positionSlider, "seek");
355
 
        m_controller->associateWidget(m_volumeSlider, "volume");
 
356
        if (m_controller) {
 
357
            m_controller->associateWidget(m_positionSlider, "seek");
 
358
            m_controller->associateWidget(m_volumeSlider, "volume");
 
359
        }
 
360
 
356
361
        emit controllerChanged(m_controller);
357
 
 
358
362
        kDebug() << "Installing" << m_watchingPlayer << "as watched player";
359
363
        dataEngine("nowplaying")->connectSource(m_watchingPlayer, this, 999);
360
364
    }