← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to kde/src/lib/videodevice.h

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (1.1.11)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: package-import@ubuntu.com-20140128182336-3xenud1kbnwmf3mz
http://bugs.debian.org/735846
http://bugs.debian.org/727164
http://bugs.debian.org/718178
http://bugs.debian.org/736583
http://bugs.debian.org/722040
http://bugs.debian.org/736746
* New upstream release 
  - Fixes "New Upstream Release" (Closes: #735846)
  - Fixes "Ringtone does not stop" (Closes: #727164)
  - Fixes "[sflphone-kde] crash on startup" (Closes: #718178)
  - Fixes "sflphone GUI crashes when call is hung up" (Closes: #736583)
* Build-Depends: ensure GnuTLS 2.6
  - libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3)
  - Fixes "FTBFS Build-Depends libgnutls{26,28}-dev" (Closes: #722040)
* Fix "boost 1.49 is going away" unversioned Build-Depends: (Closes: #736746)
* Add Build-Depends: libsndfile-dev, nepomuk-core-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/lib/videodevice.h
1
1
/****************************************************************************
2
 
 *   Copyright (C) 2012-2013 by Savoir-Faire Linux                          *
 
2
 *   Copyright (C) 2012-2014 by Savoir-Faire Linux                          *
3
3
 *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
4
4
 *                                                                          *
5
5
 *   This library is free software; you can redistribute it and/or          *
35
35
public:
36
36
   //Constructor
37
37
   Resolution(uint _width, uint _height);
38
 
   Resolution(const QString& size);
 
38
   Resolution(const QString& size = QString());
39
39
   Resolution(const Resolution& res);
40
40
   Resolution(const QSize& size);
 
41
   explicit Resolution();
41
42
   //Getter
42
43
   const QString toString() const;
43
44
 
47
48
class LIB_EXPORT VideoDevice {
48
49
   public:
49
50
      //Singleton
50
 
      static VideoDevice* getDevice(QString id);
 
51
      static VideoDevice* getDevice(const QString &id);
51
52
 
52
53
      //Getter
53
 
      const QStringList         getRateList(VideoChannel channel, Resolution resolution);
54
 
      const QList<Resolution>   getResolutionList(VideoChannel channel);
55
 
      const QList<VideoChannel> getChannelList ();
56
 
      const Resolution          getResolution  ();
57
 
      const VideoChannel        getChannel     ();
58
 
      const VideoRate           getRate        ();
59
 
      const QString             getDeviceId    () const;
60
 
      
 
54
      const QStringList         rateList(VideoChannel channel, Resolution resolution);
 
55
      const QList<Resolution>   resolutionList(VideoChannel channel);
 
56
      const QList<VideoChannel> channelList ();
 
57
      const Resolution          resolution  ();
 
58
      const VideoChannel        channel     ();
 
59
      const VideoRate           rate        ();
 
60
      const QString             deviceId    () const;
 
61
 
61
62
      //Static getter
62
 
      static const QList<VideoDevice*> getDeviceList();
 
63
      static const QList<VideoDevice*> deviceList();
63
64
 
64
65
      //Setter
65
66
      void setRate       ( VideoRate rate        );
67
68
      void setChannel    ( VideoChannel channel  );
68
69
   private:
69
70
      //Constructor
70
 
      explicit VideoDevice(QString id);
 
71
      explicit VideoDevice(const QString &id);
71
72
 
72
73
      //Attributes
73
74
      QString m_DeviceId;