Commit 4638c99c authored by Simon Morlat's avatar Simon Morlat

msvc build updated.

parent 8b691f60
......@@ -47,6 +47,8 @@ extern MSFilterDesc ms_itc_source_desc;
extern MSFilterDesc ms_itc_sink_desc;
extern MSFilterDesc ms_audio_mixer_desc;
extern MSFilterDesc ms_ext_display_desc;
extern MSFilterDesc ms_jpeg_writer_desc;
extern MSFilterDesc ms_tone_detector_desc;
MSFilterDesc * ms_filter_descs[]={
&ms_alaw_dec_desc,
......@@ -95,6 +97,8 @@ MSFilterDesc * ms_filter_descs[]={
&ms_itc_sink_desc,
&ms_audio_mixer_desc,
&ms_ext_display_desc,
&ms_tone_detector_desc,
&ms_jpeg_writer_desc,
NULL
};
......@@ -65,7 +65,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mediastreamer2.lib ortp.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(OutDir)";"..\..\..\..\ortp\build\win32native\$(ConfigurationName)""
AdditionalLibraryDirectories=""..\$(OutDir)";"$(OutDir)";"..\..\..\..\oRTP\build\win32native\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
......@@ -90,7 +90,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="echo on&#x0D;&#x0A;mkdir &quot;$(TargetDir)\lib\mediastreamer\plugins&quot; &quot;$(TargetDir)\libexec&quot; &#x0D;&#x0A;copy ..\..\..\..\h264encserver\build\vs\h264encserver\$(IntDir)\*.exe &quot;$(TargetDir)\libexec&quot;&#x0D;&#x0A;copy ..\..\..\..\msremoteh264\build\vs\$(IntDir)\*.dll &quot;$(TargetDir)\lib\mediastreamer\plugins&quot;&#x0D;&#x0A;copy ..\..\..\..\ortp\build\win32native\ortp.dll &quot;$(TargetDir)&quot;&#x0D;&#x0A;copy ..\..\..\..\linphone-deps\bin\*.dll &quot;$(TargetDir)&quot;&#x0D;&#x0A;&#x0D;&#x0A;"
CommandLine="echo on&#x0D;&#x0A;mkdir &quot;$(TargetDir)\lib\mediastreamer\plugins&quot; &quot;$(TargetDir)\libexec&quot;&#x0D;&#x0A;copy ..\..\..\..\h264encserver\build\vs\h264encserver\$(IntDir)\*.exe &quot;$(TargetDir)\libexec&quot;&#x0D;&#x0A;copy ..\..\..\..\msremoteh264\build\vs\$(IntDir)\*.dll &quot;$(TargetDir)\lib\mediastreamer\plugins&quot;&#x0D;&#x0A;copy ..\..\..\..\ortp\build\win32native\ortp.dll &quot;$(TargetDir)&quot;&#x0D;&#x0A;copy ..\..\..\..\linphone-deps\bin\*.dll &quot;$(TargetDir)&quot;&#x0D;&#x0A;&#x0D;&#x0A;"
ExcludedFromBuild="false"
/>
</Configuration>
......
......@@ -13,14 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediastream", "mediastream\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oRTP", "..\..\..\ortp\build\win32native\oRTP.vcproj", "{4A07BB2B-F56E-4F1B-A719-D28B782AC128}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msremoteh264", "..\..\..\msremoteh264\build\vs\msremoteh264.vcproj", "{5DD69337-13E2-40A4-B9E0-433B1244CD48}"
ProjectSection(ProjectDependencies) = postProject
{4A07BB2B-F56E-4F1B-A719-D28B782AC128} = {4A07BB2B-F56E-4F1B-A719-D28B782AC128}
{4A07BB2B-F56E-4F1B-A729-D28B782AC128} = {4A07BB2B-F56E-4F1B-A729-D28B782AC128}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h264encserver", "..\..\..\h264encserver\build\vs\h264encserver\h264encserver.vcproj", "{31B58784-61BB-4AB7-9151-7517AC0CFDC1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
......@@ -39,14 +31,6 @@ Global
{4A07BB2B-F56E-4F1B-A719-D28B782AC128}.Debug|Win32.Build.0 = Debug|Win32
{4A07BB2B-F56E-4F1B-A719-D28B782AC128}.Release|Win32.ActiveCfg = Release|Win32
{4A07BB2B-F56E-4F1B-A719-D28B782AC128}.Release|Win32.Build.0 = Release|Win32
{5DD69337-13E2-40A4-B9E0-433B1244CD48}.Debug|Win32.ActiveCfg = Debug|Win32
{5DD69337-13E2-40A4-B9E0-433B1244CD48}.Debug|Win32.Build.0 = Debug|Win32
{5DD69337-13E2-40A4-B9E0-433B1244CD48}.Release|Win32.ActiveCfg = Release|Win32
{5DD69337-13E2-40A4-B9E0-433B1244CD48}.Release|Win32.Build.0 = Release|Win32
{31B58784-61BB-4AB7-9151-7517AC0CFDC1}.Debug|Win32.ActiveCfg = Debug|Win32
{31B58784-61BB-4AB7-9151-7517AC0CFDC1}.Debug|Win32.Build.0 = Debug|Win32
{31B58784-61BB-4AB7-9151-7517AC0CFDC1}.Release|Win32.ActiveCfg = Release|Win32
{31B58784-61BB-4AB7-9151-7517AC0CFDC1}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
......@@ -65,12 +65,12 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libavcodec.dll.a swscale-0.lib libtheora.lib vfw32.lib Ws2_32.lib Winmm.lib ortp.lib libspeex.a libspeexdsp.a libgsm.a libgcc.a"
AdditionalDependencies="libavcodec.dll.a swscale-0.lib libavutil.dll.a libtheora.lib vfw32.lib Ws2_32.lib Winmm.lib ortp.lib libspeex.a libspeexdsp.a libgsm.a libgcc.a"
OutputFile="$(IntDir)/mediastreamer2.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\linphone-deps\lib&quot;;..\..\..\ortp\build\win32native"
IgnoreAllDefaultLibraries="false"
ModuleDefinitionFile="mediastreamer2.def"
ModuleDefinitionFile=""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mediastreamer2.pdb"
GenerateMapFile="false"
......@@ -251,6 +251,10 @@
RelativePath="..\..\src\itc.c"
>
</File>
<File
RelativePath="..\..\src\jpegwriter.c"
>
</File>
<File
RelativePath="..\..\src\kiss_fft.c"
>
......@@ -259,6 +263,10 @@
RelativePath="..\..\src\kiss_fftr.c"
>
</File>
<File
RelativePath="..\..\src\layouts.c"
>
</File>
<File
RelativePath="..\..\src\mire.c"
>
......@@ -375,6 +383,10 @@
RelativePath="..\..\src\theora.c"
>
</File>
<File
RelativePath="..\..\src\tonedetector.c"
>
</File>
<File
RelativePath="..\..\src\ulaw.c"
>
......@@ -544,10 +556,6 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
<File
RelativePath=".\mediastreamer2.def"
>
</File>
</Files>
<Globals>
</Globals>
......
This diff is collapsed.
......@@ -44,6 +44,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define ms_cond_broadcast ortp_cond_broadcast
#define ms_cond_destroy ortp_cond_destroy
#if defined(_MSC_VER)
#define MS2_PUBLIC __declspec(dllexport)
#else
#define MS2_PUBLIC
#endif
#if defined(_WIN32_WCE)
time_t ms_time (time_t *t);
#else
......@@ -109,23 +115,23 @@ extern "C"{
#endif
void ms_thread_exit(void* ret_val);
MSList * ms_list_append(MSList *elem, void * data);
MSList * ms_list_prepend(MSList *elem, void * data);
MSList * ms_list_free(MSList *elem);
MSList * ms_list_concat(MSList *first, MSList *second);
MSList * ms_list_remove(MSList *first, void *data);
int ms_list_size(const MSList *first);
void ms_list_for_each(const MSList *list, void (*func)(void *));
void ms_list_for_each2(const MSList *list, void (*func)(void *, void *), void *user_data);
MSList *ms_list_remove_link(MSList *list, MSList *elem);
MSList *ms_list_find(MSList *list, void *data);
MSList *ms_list_find_custom(MSList *list, MSCompareFunc compare_func, const void *user_data);
void * ms_list_nth_data(const MSList *list, int index);
int ms_list_position(const MSList *list, MSList *elem);
int ms_list_index(const MSList *list, void *data);
MSList *ms_list_insert_sorted(MSList *list, void *data, MSCompareFunc compare_func);
MSList *ms_list_insert(MSList *list, MSList *before, void *data);
MSList *ms_list_copy(const MSList *list);
MS2_PUBLIC MSList * ms_list_append(MSList *elem, void * data);
MS2_PUBLIC MSList * ms_list_prepend(MSList *elem, void * data);
MS2_PUBLIC MSList * ms_list_free(MSList *elem);
MS2_PUBLIC MSList * ms_list_concat(MSList *first, MSList *second);
MS2_PUBLIC MSList * ms_list_remove(MSList *first, void *data);
MS2_PUBLIC int ms_list_size(const MSList *first);
MS2_PUBLIC void ms_list_for_each(const MSList *list, void (*func)(void *));
MS2_PUBLIC void ms_list_for_each2(const MSList *list, void (*func)(void *, void *), void *user_data);
MS2_PUBLIC MSList *ms_list_remove_link(MSList *list, MSList *elem);
MS2_PUBLIC MSList *ms_list_find(MSList *list, void *data);
MS2_PUBLIC MSList *ms_list_find_custom(MSList *list, MSCompareFunc compare_func, const void *user_data);
MS2_PUBLIC void * ms_list_nth_data(const MSList *list, int index);
MS2_PUBLIC int ms_list_position(const MSList *list, MSList *elem);
MS2_PUBLIC int ms_list_index(const MSList *list, void *data);
MS2_PUBLIC MSList *ms_list_insert_sorted(MSList *list, void *data, MSCompareFunc compare_func);
MS2_PUBLIC MSList *ms_list_insert(MSList *list, MSList *before, void *data);
MS2_PUBLIC MSList *ms_list_copy(const MSList *list);
#undef MIN
#define MIN(a,b) ((a)>(b) ? (b) : (a))
......@@ -153,7 +159,7 @@ MSList *ms_list_copy(const MSList *list);
*
* This must be called once before calling any other API.
*/
void ms_init(void);
MS2_PUBLIC void ms_init(void);
/**
* Load plugins from a specific directory.
......@@ -166,20 +172,20 @@ void ms_init(void);
*
* Returns: >0 if successfull, 0 if not plugins loaded, -1 otherwise.
*/
int ms_load_plugins(const char *directory);
MS2_PUBLIC int ms_load_plugins(const char *directory);
/**
* Release resource allocated in the mediastreamer2 library.
*
* This must be called once before closing program.
*/
void ms_exit(void);
MS2_PUBLIC void ms_exit(void);
struct _MSSndCardDesc;
void ms_sleep(int seconds);
MS2_PUBLIC void ms_sleep(int seconds);
void ms_usleep(uint64_t usec);
MS2_PUBLIC void ms_usleep(uint64_t usec);
/**
* The max payload size allowed.
......@@ -190,22 +196,22 @@ void ms_usleep(uint64_t usec);
* value works for both.
*
**/
int ms_get_payload_max_size();
MS2_PUBLIC int ms_get_payload_max_size();
void ms_set_payload_max_size(int size);
MS2_PUBLIC void ms_set_payload_max_size(int size);
/**
* Returns the network Max Transmission Unit to reach destination_host.
* This will attempt to send one or more big packets to destination_host, to a random port.
* Those packets are filled with zeroes.
**/
int ms_discover_mtu(const char *destination_host);
MS2_PUBLIC int ms_discover_mtu(const char *destination_host);
/**
* Set mediastreamer default mtu, used to compute the default RTP max payload size.
* This function will call ms_set_payload_max_size(mtu-[ipv6 header size]).
**/
void ms_set_mtu(int mtu);
MS2_PUBLIC void ms_set_mtu(int mtu);
/** @} */
......
......@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef mseventqueue_h
#define mseventqueue_h
#include "mediastreamer2/mscommon.h"
typedef struct _MSEventQueue MSEventQueue;
......@@ -30,7 +31,7 @@ typedef struct _MSEventQueue MSEventQueue;
* The application can then schedule the callbacks for the events
* received by the queue by calling ms_event_queue_pump()
**/
MSEventQueue *ms_event_queue_new();
MS2_PUBLIC MSEventQueue *ms_event_queue_new();
/**
* Install a global event queue.
......@@ -39,7 +40,7 @@ MSEventQueue *ms_event_queue_new();
* to the event queue.
*
**/
void ms_set_global_event_queue(MSEventQueue *q);
MS2_PUBLIC void ms_set_global_event_queue(MSEventQueue *q);
/**
* Run callbacks associated to the events received.
......@@ -47,16 +48,16 @@ void ms_set_global_event_queue(MSEventQueue *q);
* ms_filter_set_notify_callback() in order to be informed
* of various events generated by a MSFilter.
**/
void ms_event_queue_pump(MSEventQueue *q);
MS2_PUBLIC void ms_event_queue_pump(MSEventQueue *q);
/**
* Discard all pending events.
**/
void ms_event_queue_skip(MSEventQueue *q);
MS2_PUBLIC void ms_event_queue_skip(MSEventQueue *q);
/**
* Destroys an event queue.
**/
void ms_event_queue_destroy(MSEventQueue *q);
MS2_PUBLIC void ms_event_queue_destroy(MSEventQueue *q);
#endif
......@@ -193,7 +193,7 @@ extern "C"{
*
* @param desc a filter description.
*/
void ms_filter_register(MSFilterDesc *desc);
MS2_PUBLIC void ms_filter_register(MSFilterDesc *desc);
/**
* Retrieve encoders according to codec name.
......@@ -207,7 +207,7 @@ void ms_filter_register(MSFilterDesc *desc);
*
* Returns: a MSFilterDesc if successfull, NULL otherwise.
*/
MSFilterDesc * ms_filter_get_encoder(const char *mime);
MS2_PUBLIC MSFilterDesc * ms_filter_get_encoder(const char *mime);
/**
* Retrieve decoders according to codec name.
......@@ -221,7 +221,7 @@ MSFilterDesc * ms_filter_get_encoder(const char *mime);
*
* Returns: a MSFilterDesc if successfull, NULL otherwise.
*/
MSFilterDesc * ms_filter_get_decoder(const char *mime);
MS2_PUBLIC MSFilterDesc * ms_filter_get_decoder(const char *mime);
/**
* Create encoder filter according to codec name.
......@@ -235,7 +235,7 @@ MSFilterDesc * ms_filter_get_decoder(const char *mime);
*
* Returns: a MSFilter if successfull, NULL otherwise.
*/
MSFilter * ms_filter_create_encoder(const char *mime);
MS2_PUBLIC MSFilter * ms_filter_create_encoder(const char *mime);
/**
* Create decoder filter according to codec name.
......@@ -249,7 +249,7 @@ MSFilter * ms_filter_create_encoder(const char *mime);
*
* Returns: a MSFilter if successfull, NULL otherwise.
*/
MSFilter * ms_filter_create_decoder(const char *mime);
MS2_PUBLIC MSFilter * ms_filter_create_decoder(const char *mime);
/**
* Check if a encode or decode filter exists for a codec name.
......@@ -263,7 +263,7 @@ MSFilter * ms_filter_create_decoder(const char *mime);
*
* Returns: TRUE if successfull, FALSE otherwise.
*/
bool_t ms_filter_codec_supported(const char *mime);
MS2_PUBLIC bool_t ms_filter_codec_supported(const char *mime);
/**
* Create decoder filter according to a filter's MSFilterId.
......@@ -272,7 +272,7 @@ bool_t ms_filter_codec_supported(const char *mime);
*
* Returns: a MSFilter if successfull, NULL otherwise.
*/
MSFilter *ms_filter_new(MSFilterId id);
MS2_PUBLIC MSFilter *ms_filter_new(MSFilterId id);
/**
* Create decoder filter according to a filter's name.
......@@ -281,7 +281,7 @@ MSFilter *ms_filter_new(MSFilterId id);
*
* Returns: a MSFilter if successfull, NULL otherwise.
*/
MSFilter *ms_filter_new_from_name(const char *name);
MS2_PUBLIC MSFilter *ms_filter_new_from_name(const char *name);
/**
* Create decoder filter according to a filter's description.
......@@ -293,7 +293,7 @@ MSFilter *ms_filter_new_from_name(const char *name);
*
* Returns: a MSFilter if successfull, NULL otherwise.
*/
MSFilter *ms_filter_new_from_desc(MSFilterDesc *desc);
MS2_PUBLIC MSFilter *ms_filter_new_from_desc(MSFilterDesc *desc);
/**
* Link one OUTPUT pin from a filter to an INPUT pin of another filter.
......@@ -308,7 +308,7 @@ MSFilter *ms_filter_new_from_desc(MSFilterDesc *desc);
*
* Returns: 0 if sucessful, -1 otherwise.
*/
int ms_filter_link(MSFilter *f1, int pin1, MSFilter *f2, int pin2);
MS2_PUBLIC int ms_filter_link(MSFilter *f1, int pin1, MSFilter *f2, int pin2);
/**
* Unlink one OUTPUT pin from a filter to an INPUT pin of another filter.
......@@ -320,7 +320,7 @@ int ms_filter_link(MSFilter *f1, int pin1, MSFilter *f2, int pin2);
*
* Returns: 0 if sucessful, -1 otherwise.
*/
int ms_filter_unlink(MSFilter *f1, int pin1, MSFilter *f2, int pin2);
MS2_PUBLIC int ms_filter_unlink(MSFilter *f1, int pin1, MSFilter *f2, int pin2);
/**
* Call a filter's method to set or get options.
......@@ -331,7 +331,7 @@ int ms_filter_unlink(MSFilter *f1, int pin1, MSFilter *f2, int pin2);
*
* Returns: 0 if successfull, -1 otherwise.
*/
int ms_filter_call_method(MSFilter *f, unsigned int id, void *arg);
MS2_PUBLIC int ms_filter_call_method(MSFilter *f, unsigned int id, void *arg);
/**
* Call a filter's method to set options.
......@@ -341,7 +341,7 @@ int ms_filter_call_method(MSFilter *f, unsigned int id, void *arg);
*
* Returns: 0 if successfull, -1 otherwise.
*/
int ms_filter_call_method_noarg(MSFilter *f, unsigned int id);
MS2_PUBLIC int ms_filter_call_method_noarg(MSFilter *f, unsigned int id);
/**
* Set a callback on filter's to be informed of private filter's event.
......@@ -355,14 +355,14 @@ int ms_filter_call_method_noarg(MSFilter *f, unsigned int id);
*
*
*/
void ms_filter_set_notify_callback(MSFilter *f, MSFilterNotifyFunc fn, void *userdata);
MS2_PUBLIC void ms_filter_set_notify_callback(MSFilter *f, MSFilterNotifyFunc fn, void *userdata);
/**
* Forces the filter to synchronously send notifications, that is
* the notify callback will be called from MSTicker thread instead of being
* run by a MSEventQueue.
*/
void ms_filter_enable_synchronous_notifcations(MSFilter *f, bool_t yesno);
MS2_PUBLIC void ms_filter_enable_synchronous_notifcations(MSFilter *f, bool_t yesno);
/**
* Get MSFilterId's filter.
......@@ -371,7 +371,7 @@ void ms_filter_enable_synchronous_notifcations(MSFilter *f, bool_t yesno);
*
* Returns: MSFilterId if successfull, -1 otherwise.
*/
MSFilterId ms_filter_get_id(MSFilter *f);
MS2_PUBLIC MSFilterId ms_filter_get_id(MSFilter *f);
/**
......@@ -379,7 +379,7 @@ MSFilterId ms_filter_get_id(MSFilter *f);
*
* Returns: a MSList of MSFilter, that needs to be freed by the caller when no more needed.
**/
MSList * ms_filter_find_neighbours(MSFilter *me);
MS2_PUBLIC MSList * ms_filter_find_neighbours(MSFilter *me);
/**
* Destroy a filter object.
......@@ -387,7 +387,7 @@ MSList * ms_filter_find_neighbours(MSFilter *me);
* @param f A MSFilter object.
*
*/
void ms_filter_destroy(MSFilter *f);
MS2_PUBLIC void ms_filter_destroy(MSFilter *f);
/**
* Initialize a MSConnectionHelper.
......@@ -395,7 +395,7 @@ void ms_filter_destroy(MSFilter *f);
* @param h A MSConnectionHelper, usually (but not necessarily) on stack
*
**/
void ms_connection_helper_start(MSConnectionHelper *h);
MS2_PUBLIC void ms_connection_helper_start(MSConnectionHelper *h);
/**
* \brief Enter a MSFilter to be connected into the MSConnectionHelper object.
......@@ -433,7 +433,7 @@ void ms_connection_helper_start(MSConnectionHelper *h);
*
* Returns: the return value of ms_filter_link() that is called internally to this function.
**/
int ms_connection_helper_link(MSConnectionHelper *h, MSFilter *f, int inpin, int outpin);
MS2_PUBLIC int ms_connection_helper_link(MSConnectionHelper *h, MSFilter *f, int inpin, int outpin);
/**
......@@ -441,33 +441,33 @@ int ms_connection_helper_link(MSConnectionHelper *h, MSFilter *f, int inpin, int
* Process exactly the same way as ms_connection_helper_link() but calls ms_filter_unlink() on the
* entered filters.
**/
int ms_connection_helper_unlink(MSConnectionHelper *h, MSFilter *f, int inpin, int outpin);
MS2_PUBLIC int ms_connection_helper_unlink(MSConnectionHelper *h, MSFilter *f, int inpin, int outpin);
/**
* \brief Enable processing time measurements statistics for filters.
*
**/
void ms_filter_enable_statistics(bool_t enabled);
MS2_PUBLIC void ms_filter_enable_statistics(bool_t enabled);
/**
* \brief Reset processing time statistics for filters.
*
**/
void ms_filter_reset_statistics(void);
MS2_PUBLIC void ms_filter_reset_statistics(void);
/**
* \brief Retrieves statistics for running filters.
* Returns a list of MSFilterStats
**/
const MSList * ms_filter_get_statistics(void);
MS2_PUBLIC const MSList * ms_filter_get_statistics(void);
/**
* \brief Logs runtime statistics for running filters.
*
**/
void ms_filter_log_statistics(void);
MS2_PUBLIC void ms_filter_log_statistics(void);
/* I define the id taking the lower bits of the address of the MSFilterDesc object,
......
......@@ -154,13 +154,13 @@ extern "C"{
*
* Returns: MSSndCardManager if successfull, NULL otherwise.
*/
MSSndCardManager * ms_snd_card_manager_get(void);
MS2_PUBLIC MSSndCardManager * ms_snd_card_manager_get(void);
/**
* Destroy a sound card manager object.
*
*/
void ms_snd_card_manager_destroy(void);
MS2_PUBLIC void ms_snd_card_manager_destroy(void);
/**
* Retreive a sound card object based on its name.
......@@ -170,7 +170,7 @@ void ms_snd_card_manager_destroy(void);
*
* Returns: MSSndCard if successfull, NULL otherwise.
*/
MSSndCard * ms_snd_card_manager_get_card(MSSndCardManager *m, const char *id);
MS2_PUBLIC MSSndCard * ms_snd_card_manager_get_card(MSSndCardManager *m, const char *id);
/**
* Retreive the default sound card object.
......@@ -179,7 +179,7 @@ MSSndCard * ms_snd_card_manager_get_card(MSSndCardManager *m, const char *id);
*
* Returns: MSSndCard if successfull, NULL otherwise.
*/
MSSndCard * ms_snd_card_manager_get_default_card(MSSndCardManager *m);
MS2_PUBLIC MSSndCard * ms_snd_card_manager_get_default_card(MSSndCardManager *m);
/**
* Retreive the default capture sound card object.
......@@ -188,7 +188,7 @@ MSSndCard * ms_snd_card_manager_get_default_card(MSSndCardManager *m);
*
* Returns: MSSndCard if successfull, NULL otherwise.
*/
MSSndCard * ms_snd_card_manager_get_default_capture_card(MSSndCardManager *m);
MS2_PUBLIC MSSndCard * ms_snd_card_manager_get_default_capture_card(MSSndCardManager *m);
/**
* Retreive the default playback sound card object.
......@@ -197,7 +197,7 @@ MSSndCard * ms_snd_card_manager_get_default_capture_card(MSSndCardManager *m);
*
* Returns: MSSndCard if successfull, NULL otherwise.
*/
MSSndCard * ms_snd_card_manager_get_default_playback_card(MSSndCardManager *m);
MS2_PUBLIC MSSndCard * ms_snd_card_manager_get_default_playback_card(MSSndCardManager *m);
/**
* Retreive the list of sound card objects.
......@@ -206,7 +206,7 @@ MSSndCard * ms_snd_card_manager_get_default_playback_card(MSSndCardManager *m);
*
* Returns: MSList of cards if successfull, NULL otherwise.
*/
const MSList * ms_snd_card_manager_get_list(MSSndCardManager *m);
MS2_PUBLIC const MSList * ms_snd_card_manager_get_list(MSSndCardManager *m);
/**
* Add a sound card object in a sound card manager's list.
......@@ -215,7 +215,7 @@ const MSList * ms_snd_card_manager_get_list(MSSndCardManager *m);
* @param c A sound card object.
*
*/
void ms_snd_card_manager_add_card(MSSndCardManager *m, MSSndCard *c);
MS2_PUBLIC void ms_snd_card_manager_add_card(MSSndCardManager *m, MSSndCard *c);
/**
* Register a sound card description in a sound card manager.
......@@ -224,13 +224,13 @@ void ms_snd_card_manager_add_card(MSSndCardManager *m, MSSndCard *c);
* @param desc A sound card description object.
*
*/
void ms_snd_card_manager_register_desc(MSSndCardManager *m, MSSndCardDesc *desc);
MS2_PUBLIC void ms_snd_card_manager_register_desc(MSSndCardManager *m, MSSndCardDesc *desc);
/**
* Ask all registered MSSndCardDesc to re-detect their soundcards.
* @param m The sound card manager.
**/
void ms_snd_card_manager_reload(MSSndCardManager *m);
MS2_PUBLIC void ms_snd_card_manager_reload(MSSndCardManager *m);
/** @} */
......@@ -247,7 +247,7 @@ void ms_snd_card_manager_reload(MSSndCardManager *m);
*
* Returns: A MSFilter if successfull, NULL otherwise.
*/
struct _MSFilter * ms_snd_card_create_reader(MSSndCard *obj);
MS2_PUBLIC struct _MSFilter * ms_snd_card_create_reader(MSSndCard *obj);
/**
* Create an OUPUT filter based on the selected sound card.
......@@ -256,7 +256,7 @@ struct _MSFilter * ms_snd_card_create_reader(MSSndCard *obj);
*
* Returns: A MSFilter if successfull, NULL otherwise.
*/
struct _MSFilter * ms_snd_card_create_writer(MSSndCard *obj);
MS2_PUBLIC struct _MSFilter * ms_snd_card_create_writer(MSSndCard *obj);
/**
* Create a new sound card object.
......@@ -265,7 +265,7 @@ struct _MSFilter * ms_snd_card_create_writer(MSSndCard *obj);
*
* Returns: MSSndCard if successfull, NULL otherwise.
*/
MSSndCard * ms_snd_card_new(MSSndCardDesc *desc);
MS2_PUBLIC MSSndCard * ms_snd_card_new(MSSndCardDesc *desc);
/**
* Create a new sound card object.
......@@ -276,13 +276,13 @@ MSSndCard * ms_snd_card_new(MSSndCardDesc *desc);
* Returns: MSSndCard if successfull, NULL otherwise.
*/
MSSndCard * ms_snd_card_new_with_name(MSSndCardDesc *desc,const char* name);
MS2_PUBLIC MSSndCard * ms_snd_card_new_with_name(MSSndCardDesc *desc,const char* name);
/**
* Destroy sound card object.
*
* @param obj A MSSndCard object.
*/
void ms_snd_card_destroy(MSSndCard *obj);
MS2_PUBLIC void ms_snd_card_destroy(MSSndCard *obj);
/**
* Duplicate a sound card object.
......@@ -293,7 +293,7 @@ void ms_snd_card_destroy(MSSndCard *obj);
*
* Returns: MSSndCard if successfull, NULL otherwise.
*/
MSSndCard * ms_snd_card_dup(MSSndCard *card);
MS2_PUBLIC MSSndCard * ms_snd_card_dup(MSSndCard *card);
/**
* Retreive a sound card's driver type string.
......@@ -304,7 +304,7 @@ MSSndCard * ms_snd_card_dup(MSSndCard *card);
*
* Returns: a string if successfull, NULL otherwise.
*/
const char *ms_snd_card_get_driver_type(const MSSndCard *obj);
MS2_PUBLIC const char *ms_snd_card_get_driver_type(const MSSndCard *obj);
/**
* Retreive a sound card's name.
......@@ -313,7 +313,7 @@ const char *ms_snd_card_get_driver_type(const MSSndCard *obj);
*
* Returns: a string if successfull, NULL otherwise.
*/
const char *ms_snd_card_get_name(const MSSndCard *obj);
MS2_PUBLIC const char *ms_snd_card_get_name(const MSSndCard *obj);
/**
* Retreive sound card's name ($driver_type: $name).
......@@ -322,7 +322,7 @@ const char *ms_snd_card_get_name(const MSSndCard *obj);
*
* Returns: A string if successfull, NULL otherwise.
*/
const char *ms_snd_card_get_string_id(MSSndCard *obj);
MS2_PUBLIC const char *ms_snd_card_get_string_id(MSSndCard *obj);
/**
......@@ -338,7 +338,7 @@ const char *ms_snd_card_get_string_id(MSSndCard *obj);
*
* Returns: A unsigned int if successfull, 0 otherwise.
*/
unsigned int ms_snd_card_get_capabilities(const MSSndCard *obj);
MS2_PUBLIC unsigned int ms_snd_card_get_capabilities(const MSSndCard *obj);
/**
* Set some mixer level value.
......@@ -355,7 +355,7 @@ unsigned int ms_snd_card_get_capabilities(const MSSndCard *obj);
* @param percent A volume level.
*
*/
void ms_snd_card_set_level(MSSndCard *obj, MSSndCardMixerElem e, int percent);
MS2_PUBLIC void ms_snd_card_set_level(MSSndCard *obj, MSSndCardMixerElem e, int percent);
/**
* Get some mixer level value.
......@@ -372,7 +372,7 @@ void ms_snd_card_set_level(MSSndCard *obj, MSSndCardMixerElem e, int percent);
*
* Returns: A int if successfull, <0 otherwise.
*/
int ms_snd_card_get_level(MSSndCard *obj, MSSndCardMixerElem e);
MS2_PUBLIC int ms_snd_card_get_level(MSSndCard *obj, MSSndCardMixerElem e);
/**
* Set some source for capture.
......@@ -388,7 +388,7 @@ int ms_snd_card_get_level(MSSndCard *obj, MSSndCardMixerElem e);
*
* Returns: A int if successfull, 0 otherwise.
*/
void ms_snd_card_set_capture(MSSndCard *obj, MSSndCardCapture c);
MS2_PUBLIC void ms_snd_card_set_capture(MSSndCard *obj, MSSndCardCapture c);
/**
* Set some mixer control.
......@@ -406,7 +406,7 @@ void ms_snd_card_set_capture(MSSndCard *obj, MSSndCardCapture c);
*
* Returns: 0 if successfull, <0 otherwise.
*/
int ms_snd_card_set_control(MSSndCard *obj, MSSndCardControlElem e, int val);
MS2_PUBLIC int ms_snd_card_set_control(MSSndCard *obj, MSSndCardControlElem e, int val);
/**
* Get some mixer control.
......@@ -423,7 +423,7 @@ int ms_snd_card_set_control(MSSndCard *obj, MSSndCardControlElem e, int val);
*
* Returns: A int if successfull, <0 otherwise.
*/
int ms_snd_card_get_control(MSSndCard *obj, MSSndCardControlElem e);
MS2_PUBLIC int ms_snd_card_get_control(MSSndCard *obj, MSSndCardControlElem e);
/**
* Create a alsa card with user supplied pcm name and mixer name.
......@@ -432,7 +432,7 @@ int ms_snd_card_get_control(MSSndCard *obj, MSSndCardControlElem e);
*
* Returns: a MSSndCard object, NULL if alsa support is not available.
*/
MSSndCard * ms_alsa_card_new_custom(const char *pcmdev, const char *mixdev);
MS2_PUBLIC MSSndCard * ms_alsa_card_new_custom(const char *pcmdev, const char *mixdev);
/** @} */
......
......@@ -85,12 +85,12 @@ extern "C"{
*
* Returns: MSTicker * if successfull, NULL otherwise.
*/
MSTicker *ms_ticker_new(void);
MS2_PUBLIC MSTicker *ms_ticker_new(void);
/**
* Set a name to the ticker (used for logging)
**/
void ms_ticker_set_name(MSTicker *ticker, const char *name);
MS2_PUBLIC void ms_ticker_set_name(MSTicker *ticker, const char *name);
/**
* Attach a chain of filters to a ticker.
......@@ -102,7 +102,7 @@ void ms_ticker_set_name(MSTicker *ticker, const char *name);
*
* Returns: 0 if successfull, -1 otherwise.
*/
int ms_ticker_attach(MSTicker *ticker,MSFilter *f);
MS2_PUBLIC int ms_ticker_attach(MSTicker *ticker,MSFilter *f);
/**
* Dettach a chain of filters to a ticker.
......@@ -114,7 +114,7 @@ int ms_ticker_attach(MSTicker *ticker,MSFilter *f);
*
* Returns: 0 if successfull, -1 otherwise.
*/
int ms_ticker_detach(MSTicker *ticker,MSFilter *f);
MS2_PUBLIC int ms_ticker_detach(MSTicker *ticker,MSFilter *f);
/**
* Destroy a ticker.
......@@ -122,7 +122,7 @@ int ms_ticker_detach(MSTicker *ticker,MSFilter *f);
* @param ticker A #MSTicker object.
*
*/
void ms_ticker_destroy(MSTicker *ticker);
MS2_PUBLIC