Skip to content
Snippets Groups Projects
Commit 66da2307 authored by jpbl's avatar jpbl
Browse files

started the openal work

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