← Back to branch summary

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

« back to all changes in this revision

Viewing changes to kde/src/widgets/videodock.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/widgets/videodock.h
1
1
/***************************************************************************
2
 
 *   Copyright (C) 2011-2013 by Savoir-Faire Linux                         *
 
2
 *   Copyright (C) 2011-2014 by Savoir-Faire Linux                         *
3
3
 *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
4
4
 *                                                                         *
5
5
 *   This program is free software; you can redistribute it and/or modify  *
23
23
//Qt
24
24
 
25
25
//SFLPhone
26
 
class VideoWidget;
 
26
class VideoWidget3;
27
27
class VideoRenderer;
28
28
 
29
29
///VideoDock: A dock hosting a VideoWidget or AcceleratedVideoWidget
31
31
   Q_OBJECT
32
32
public:
33
33
   explicit VideoDock(QWidget* parent = nullptr );
34
 
   void setRenderer(VideoRenderer* r);
 
34
   void addRenderer(VideoRenderer* r);
35
35
 
36
36
private:
37
 
   VideoWidget* m_pVideoWidet;
38
 
 
39
 
 
 
37
   VideoWidget3*  m_pVideoWidet;
40
38
};
41
39
 
42
40
#endif