|
Lines 95-100
Link Here
|
| 95 |
qDebug() << "Device not found."; |
95 |
qDebug() << "Device not found."; |
| 96 |
return EXIT_FAILURE; |
96 |
return EXIT_FAILURE; |
| 97 |
} |
97 |
} |
|
|
98 |
#ifdef COMPILE_KDE_SUPPORT |
| 98 |
if (device < 0) |
99 |
if (device < 0) |
| 99 |
{ |
100 |
{ |
| 100 |
qDebug() << "Trying to load saved device."; |
101 |
qDebug() << "Trying to load saved device."; |
|
Lines 108-113
Link Here
|
| 108 |
qDebug() << "Saved device is not available, using default device:" << device; |
109 |
qDebug() << "Saved device is not available, using default device:" << device; |
| 109 |
} |
110 |
} |
| 110 |
} |
111 |
} |
|
|
112 |
#endif |
| 111 |
int isopen = EXIT_FAILURE; |
113 |
int isopen = EXIT_FAILURE; |
| 112 |
if ((device != m_current_device) || !isOpen()) |
114 |
if ((device != m_current_device) || !isOpen()) |
| 113 |
{ |
115 |
{ |
|
Lines 119-130
Link Here
|
| 119 |
return EXIT_FAILURE; |
121 |
return EXIT_FAILURE; |
| 120 |
} |
122 |
} |
| 121 |
isopen = m_videodevices[device]->open(); |
123 |
isopen = m_videodevices[device]->open(); |
|
|
124 |
#ifdef COMPILE_KDE_SUPPORT |
| 122 |
if (isopen == EXIT_SUCCESS) |
125 |
if (isopen == EXIT_SUCCESS) |
| 123 |
{ |
126 |
{ |
| 124 |
m_current_device = device; |
127 |
m_current_device = device; |
| 125 |
loadDeviceConfig(); // Load and apply device parameters |
128 |
loadDeviceConfig(); // Load and apply device parameters |
| 126 |
m_clients++; |
129 |
m_clients++; |
| 127 |
} |
130 |
} |
|
|
131 |
#endif |
| 128 |
} |
132 |
} |
| 129 |
else |
133 |
else |
| 130 |
{ |
134 |
{ |
|
Lines 592-597
Link Here
|
| 592 |
\fn int Kopete::AV::VideoDevicePool::getSavedDevice() |
596 |
\fn int Kopete::AV::VideoDevicePool::getSavedDevice() |
| 593 |
\brief Returns the index of the saved device |
597 |
\brief Returns the index of the saved device |
| 594 |
*/ |
598 |
*/ |
|
|
599 |
#ifdef COMPILE_KDE_SUPPORT |
| 595 |
int VideoDevicePool::getSavedDevice() |
600 |
int VideoDevicePool::getSavedDevice() |
| 596 |
{ |
601 |
{ |
| 597 |
qDebug() << "called"; |
602 |
qDebug() << "called"; |
|
Lines 764-769
Link Here
|
| 764 |
} |
769 |
} |
| 765 |
/* TODO: save signal standard */ |
770 |
/* TODO: save signal standard */ |
| 766 |
} |
771 |
} |
|
|
772 |
#endif |
| 767 |
|
773 |
|
| 768 |
void VideoDevicePool::deviceAdded( const QString & udi ) |
774 |
void VideoDevicePool::deviceAdded( const QString & udi ) |
| 769 |
{ |
775 |
{ |
