Commit 66da2307 authored by jpbl's avatar jpbl

started the openal work

parent e5bd0270
......@@ -191,6 +191,7 @@ src/Makefile \
src/sflphone \
src/audio/Makefile \
src/audio/gsm/Makefile \
src/audio/OpenAL/Makefile \
src/audio/pacpp/Makefile \
src/audio/pacpp/include/Makefile \
src/audio/pacpp/include/portaudiocpp/Makefile \
......
......@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libportaudio.la
libportaudio_la_CFLAGS = $(PORTAUDIO_CFLAGS)
libportaudio_la_LIBADD = $(PORTAUDIO_LIBS)
libportaudio_la_CXXFLAGS = $(PORTAUDIO_CXXFLAGS)
libportaudio_la_CPPFLAGS = $(PORTAUDIO_CPPFLAGS) -I$(top_srcdir)/libs/portaudio/pa_common/
libportaudio_la_CPPFLAGS = $(PORTAUDIO_CPPFLAGS)
if ENABLE_OSS
......
......@@ -27,6 +27,6 @@
namespace utilspp
{
struct EmptyType {};
};
}
#endif
......@@ -36,6 +36,6 @@ namespace utilspp
NonCopyable(const NonCopyable&)
{}
};
};
}
#endif
......@@ -27,6 +27,6 @@
namespace utilspp
{
struct NullType;
};
}
#endif
......@@ -181,6 +181,6 @@ namespace utilspp
private:
CountingBodyPolicy * mContent;
};
};
}
#endif
......@@ -37,7 +37,7 @@ namespace utilspp
typedef T VolatileType;
};
};
}
#include "ThreadingFactoryMutex.inl"
......
......@@ -45,7 +45,7 @@ namespace utilspp
typedef T VolatileType;
};
};
}
#include "ThreadingSingle.inl"
......
......@@ -27,7 +27,7 @@
template< typename T >
inline
utilspp::ThreadingSingle< T >::lock::lock()
{};
{}
template< typename T >
inline
......@@ -39,12 +39,12 @@ template< typename T >
inline
void
utilspp::ThreadingSingle< T >::mutex::lock()
{};
{}
template< typename T >
inline
void
utilspp::ThreadingSingle< T >::mutex::unlock()
{};
{}
#endif
......@@ -209,7 +209,7 @@ namespace utilspp
Result;
};
};
};
}
#endif
......
......@@ -911,6 +911,6 @@ namespace utilspp
typedef TYPE_LIST_15(W, X, Y, Z, A, B, C, D, E, F, G, H, I, J, K) ParamList;
};
};
}
#endif
......@@ -36,7 +36,7 @@ namespace utilspp
static T *create();
static void destroy( T *obj );
};
};
}
#include "CreationUsingNew.inl"
......
......@@ -36,7 +36,7 @@ namespace utilspp
static void scheduleDestruction( T *obj, void (*func)() );
static void onDeadReference();
};
};
}
#include "LifetimeDefault.inl"
......
......@@ -49,7 +49,7 @@ namespace utilspp
static void scheduleDestruction( T *obj, void (*func)() );
static void onDeadReference();
};
};
}
#include "LifetimeWithLongevity.inl"
......
......@@ -29,7 +29,7 @@ utilspp::setLongevity( T *obj, unsigned int longevity, TDestroyer d )
*pos = p;
mNbElements++;
std::atexit( &atExitFunc );
};
}
template< typename T >
void
......
......@@ -85,8 +85,8 @@ namespace utilspp
void operator()(T*);
void (*mFunc)();
};
};
};
}
}
#include "PrivateMembers.inl"
......
......@@ -59,7 +59,7 @@ namespace utilspp
static bool mDestroyed;
};
};
}
#include "SingletonHolder.inl"
......
......@@ -47,7 +47,7 @@ ThreadingModel
}
return ( *mInstance );
};
}
template
<
......
This diff is collapsed.
......@@ -47,7 +47,7 @@
</sizepolicy>
</property>
<property name="cursor">
<cursor>13</cursor>
<cursor>2</cursor>
</property>
<property name="currentItem">
<number>-1</number>
......@@ -157,7 +157,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel" row="0" column="0" colspan="3">
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>lblFullName</cstring>
</property>
......@@ -165,7 +165,7 @@
<string>Full name</string>
</property>
</widget>
<widget class="QLineEdit" row="1" column="0" colspan="3">
<widget class="QLineEdit" row="1" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>fullName</cstring>
</property>
......@@ -178,7 +178,7 @@
</sizepolicy>
</property>
</widget>
<widget class="QLabel" row="2" column="0" colspan="3">
<widget class="QLabel" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>lblUserHostPart</cstring>
</property>
......@@ -204,8 +204,8 @@
<cstring>hostPart</cstring>
</property>
</widget>
</grid>
</widget>
</grid>
</widget>
<widget class="QGroupBox">
<property name="name">
<cstring>groupBox2</cstring>
......@@ -217,6 +217,9 @@
<string></string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel" row="0" column="0">
<property name="name">
<cstring>lblAuthorizationUsre</cstring>
......@@ -921,7 +924,7 @@
<attribute name="title">
<string>Themes</string>
</attribute>
<widget class="QComboBox">
<widget class="QListBox">
<property name="name">
<cstring>SkinChoice</cstring>
</property>
......@@ -931,29 +934,13 @@
<property name="geometry">
<rect>
<x>12</x>
<y>42</y>
<width>110</width>
<height>27</height>
<y>20</y>
<width>122</width>
<height>110</height>
</rect>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>buttonApplySkin</cstring>
</property>
<property name="geometry">
<rect>
<x>136</x>
<y>40</y>
<width>80</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>&amp;Apply</string>
</property>
<property name="accel">
<string>Alt+A</string>
<property name="lineWidth">
<number>10</number>
</property>
</widget>
</widget>
......@@ -1401,12 +1388,6 @@ Montreal, Quebec H2T 1S6&lt;/p&gt;</string>
<receiver>ConfigurationPanel</receiver>
<slot>accept()</slot>
</connection>
<connection>
<sender>buttonApplySkin</sender>
<signal>clicked()</signal>
<receiver>ConfigurationPanel</receiver>
<slot>applySkinSlot()</slot>
</connection>
<connection>
<sender>Menu</sender>
<signal>clicked(QListBoxItem*)</signal>
......@@ -1443,6 +1424,12 @@ Montreal, Quebec H2T 1S6&lt;/p&gt;</string>
<receiver>ConfigurationPanel</receiver>
<slot>useStunSlot(int)</slot>
</connection>
<connection>
<sender>SkinChoice</sender>
<signal>highlighted(const QString&amp;)</signal>
<receiver>ConfigurationPanel</receiver>
<slot>applySkinSlot()</slot>
</connection>
</connections>
<tabstops>
<tabstop>fullName</tabstop>
......@@ -1470,7 +1457,6 @@ Montreal, Quebec H2T 1S6&lt;/p&gt;</string>
<tabstop>Tab_Preferences</tabstop>
<tabstop>Tab_About</tabstop>
<tabstop>useStunNo</tabstop>
<tabstop>buttonApplySkin</tabstop>
</tabstops>
<includes>
<include location="local" impldecl="in implementation">ConfigurationPanel.ui.h</include>
......@@ -1485,10 +1471,11 @@ Montreal, Quebec H2T 1S6&lt;/p&gt;</string>
<slot>useStunSlot( int id )</slot>
<slot>applySkinSlot()</slot>
<slot>driverSlot( int id )</slot>
<slot>updateSkins()</slot>
<slot>updateRingtones()</slot>
<slot>updateAudioDevices()</slot>
<slot>updateCodecs()</slot>
<slot>updateSkins()</slot>
<slot>updateAudioDevices()</slot>
<slot>SkinChoice_selected( const QString &amp; )</slot>
</slots>
<functions>
<function access="private" specifier="non virtual">init()</function>
......
......@@ -309,7 +309,7 @@ void ConfigurationPanel::updateSkins()
{
SkinChoice->clear();
SkinChoice->insertStringList(SkinManager::instance().getSkins());
SkinChoice->setCurrentText(SkinManager::instance().getCurrentSkin());
SkinChoice->setSelected(SkinChoice->findItem(SkinManager::instance().getCurrentSkin(), Qt::ExactMatch), true);
}
void ConfigurationPanel::updateRingtones()
......@@ -387,3 +387,9 @@ void ConfigurationPanel::updateAudioDevices()
// Set position of the button group, with appropriate length
DriverChoice->setGeometry( QRect( 10, 10, 410, top + 30 ) );
}
void ConfigurationPanel::SkinChoice_selected( const QString & )
{
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment