summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfred E. Heggestad <aeh@db.org>2014-06-15 23:41:49 +0200
committerAlfred E. Heggestad <aeh@db.org>2014-06-15 23:41:49 +0200
commit0ae450a912a16c2649c3d7e903828f2013af081c (patch)
tree3700ba0998d28755a4417c8b1f91a2d55a15cb52
parent23833983d2f5c15e5896bf3b883270ad70ef7793 (diff)
remove support for Symbian OS
R.I.P. Symbian it was nice to know you, too bad the people at Nokia did not take better care of you ..
-rw-r--r--docs/README3
-rw-r--r--mk/symbian/baresip.mmp87
-rw-r--r--mk/symbian/baresip_gcce.pkg24
-rw-r--r--mk/symbian/baresip_reg.rss16
-rw-r--r--mk/symbian/baresip_thumb.pkg14
-rw-r--r--mk/symbian/bld.inf12
-rw-r--r--mk/symbian/ecrt.cpp31
-rw-r--r--mk/symbian/mod.cpp19
-rw-r--r--mk/symbian/static.c14
-rw-r--r--modules/mda/mda.c40
-rw-r--r--modules/mda/mda.h17
-rw-r--r--modules/mda/player.cpp176
-rw-r--r--modules/mda/recorder.cpp170
-rw-r--r--modules/mda/util.cpp39
14 files changed, 0 insertions, 662 deletions
diff --git a/docs/README b/docs/README
index f1efe03..937b9f0 100644
--- a/docs/README
+++ b/docs/README
@@ -165,7 +165,6 @@ ice ICE protocol for NAT Traversal
ilbc iLBC audio codec
isac iSAC audio codec
l16 L16 audio codec
-mda Symbian Mediaserver audio driver (now deprecated)
menu Interactive menu
mwi Message Waiting Indication
natbd NAT Behavior Discovery Module
@@ -289,7 +288,6 @@ Supported platforms:
* FreeBSD
* OpenBSD
* NetBSD
-* Symbian OS
* Solaris
* Windows
* Apple Mac OS X and iOS
@@ -302,7 +300,6 @@ Supported compilers:
* gcce
* llvm clang
* ms vc2003 compiler
-* codewarrior
External dependencies:
diff --git a/mk/symbian/baresip.mmp b/mk/symbian/baresip.mmp
deleted file mode 100644
index 888ae0c..0000000
--- a/mk/symbian/baresip.mmp
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * @file baresip.mmp Symbian makefile for baresip application
- *
- * Copyright (C) 2010 Creytiv.com
- */
-TARGET baresip.exe
-TARGETTYPE exe
-UID 0x100039CE 0x20011300
-
-#ifdef EKA2
-VENDORID 0
-CAPABILITY NetworkServices
-
-SOURCEPATH .
-START RESOURCE baresip_reg.rss
-#ifdef WINSCW
-TARGETPATH \private\10003a3f\apps
-#else
-TARGETPATH \private\10003a3f\import\apps
-#endif
-END
-#endif
-
-MACRO HAVE_PWD_H
-MACRO HAVE_UNISTD_H
-//MACRO USE_VIDEO
-
-SOURCEPATH ..\..\src
-SOURCE aucodec.c
-SOURCE audio.c
-SOURCE aufilt.c
-SOURCE auplay.c
-SOURCE ausrc.c
-SOURCE bfcp.c
-SOURCE call.c
-SOURCE cmd.c
-SOURCE conf.c
-SOURCE contact.c
-SOURCE main.c
-SOURCE mctrl.c
-SOURCE menc.c
-SOURCE mnat.c
-SOURCE module.c
-SOURCE net.c
-SOURCE play.c
-SOURCE reg.c
-SOURCE rtpkeep.c
-SOURCE sdp.c
-SOURCE sipreq.c
-SOURCE stream.c
-SOURCE ua.c
-SOURCE ui.c
-SOURCE vidcodec.c
-SOURCE vidfilt.c
-
-/* Static modules */
-MACRO STATIC
-
-SOURCEPATH .
-SOURCE static.c
-
-SOURCEPATH ..\..\modules\cons
-SOURCE cons.c
-
-SOURCEPATH ..\..\modules\g711
-SOURCE g711.c
-
-SOURCEPATH ..\..\modules\mda
-SOURCE mda.c player.cpp recorder.cpp util.cpp
-LIBRARY mediaclientaudiostream.lib mediaclientaudioinputstream.lib
-
-#ifdef EKA2
-SOURCEPATH .
-SOURCE ecrt.cpp
-#endif
-
-SYSTEMINCLUDE . ..\..\include
-SYSTEMINCLUDE \epoc32\include \epoc32\include\libc \epoc32\include\re
-SYSTEMINCLUDE \epoc32\include\rem
-LIBRARY estlib.lib euser.lib
-LIBRARY esock.lib insock.lib
-STATICLIBRARY resdp.lib resipsess.lib resip.lib restun.lib redns.lib re.lib
-STATICLIBRARY resipevent.lib rebfcp.lib rem.lib
-#ifndef EKA2
-STATICLIBRARY ecrt0.lib
-STATICLIBRARY libgcc.a
-#endif
diff --git a/mk/symbian/baresip_gcce.pkg b/mk/symbian/baresip_gcce.pkg
deleted file mode 100644
index f4e47e6..0000000
--- a/mk/symbian/baresip_gcce.pkg
+++ /dev/null
@@ -1,24 +0,0 @@
-; baresip_gcce.pkg
-;
-;Language - standard language definitions
-&EN
-
-; standard SIS file header
-#{"baresip"},(0x20011300),1,0,0
-
-;Localised Vendor name
-%{"Creytiv.com"}
-
-;Unique Vendor name
-:"Creytiv.com"
-
-;Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"S60ProductID"}
-
-;Files to install
-"\epoc32\release\gcce\urel\baresip.exe" -"!:\sys\bin\baresip.exe"
-
-"\epoc32\data\z\private\10003a3f\import\apps\baresip_reg.rsc" -"!:\private\10003a3f\import\apps\baresip_reg.rsc"
-
-;required for application to be covered by backup/restore facility
-;"backup_registration.xml" -"c:\private\A00001F4\backup_registration.xml"
diff --git a/mk/symbian/baresip_reg.rss b/mk/symbian/baresip_reg.rss
deleted file mode 100644
index 58f91a3..0000000
--- a/mk/symbian/baresip_reg.rss
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * baresip_reg.rss
- */
-
-#include <appinfo.rh>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x20011300
-
-RESOURCE APP_REGISTRATION_INFO
- {
- app_file="baresip";
-
- embeddability=KAppNotEmbeddable;
- newfile=KAppDoesNotSupportNewFile;
- }
diff --git a/mk/symbian/baresip_thumb.pkg b/mk/symbian/baresip_thumb.pkg
deleted file mode 100644
index a789a49..0000000
--- a/mk/symbian/baresip_thumb.pkg
+++ /dev/null
@@ -1,14 +0,0 @@
-; baresip_thumb.pkg
-;
-;Language - standard language definitions
-&EN
-
-; standard SIS file header
-#{"baresip"},(0x20011300),1,0,0
-
-;Supports Series 80 v 2.0
-(0x101F8ED2), 0, 0, 0, {"Series80ProductID"}
-
-;Files to install
-"\epoc32\release\thumb\urel\baresip.exe"
--"!:\system\apps\baresip\baresip.exe"
diff --git a/mk/symbian/bld.inf b/mk/symbian/bld.inf
deleted file mode 100644
index e429de1..0000000
--- a/mk/symbian/bld.inf
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * @file bld.inf Symbian build information
- *
- * Copyright (C) 2010 Creytiv.com
- */
-
-PRJ_MMPFILES
-
-/* Application */
-baresip.mmp
-
-/* Modules */
diff --git a/mk/symbian/ecrt.cpp b/mk/symbian/ecrt.cpp
deleted file mode 100644
index 7d5e5d6..0000000
--- a/mk/symbian/ecrt.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @file ecrt.cpp ECRT wrapper for Symbian OS
- *
- * Copyright (C) 2010 Creytiv.com
- */
-#include <stdlib.h>
-#include <stdio.h>
-#include <e32base.h>
-#include <e32cons.h>
-#include <sys/reent.h>
-
-_LIT(KAppName, "baresip");
-extern "C" int main(int argc, char** argv);
-
-
-TInt E32Main()
-{
- __UHEAP_MARK;
- CTrapCleanup* cleanup = CTrapCleanup::New();
- int ret = 0;
- TRAPD(err, ret = main(0, NULL));
- if (err)
- printf("main left with error %d\n", err);
- if (ret)
- printf("main returned %d\n", ret);
- __ASSERT_ALWAYS(!err, User::Panic(KAppName, err));
- CloseSTDLIB();
- delete cleanup;
- __UHEAP_MARKEND;
- return err;
-}
diff --git a/mk/symbian/mod.cpp b/mk/symbian/mod.cpp
deleted file mode 100644
index 0ccbe2d..0000000
--- a/mk/symbian/mod.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file mod.cpp Module wrapper for Symbian OS
- *
- * Copyright (C) 2010 Creytiv.com
- */
-#include <e32def.h>
-#include <e32std.h>
-#include <re_types.h>
-#include <re_mod.h>
-
-extern "C" {
- extern const struct mod_export exports;
-}
-
-
-EXPORT_C void *NewModule()
-{
- return (void *)&exports;
-}
diff --git a/mk/symbian/static.c b/mk/symbian/static.c
deleted file mode 100644
index 8ada5a1..0000000
--- a/mk/symbian/static.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* static.c - manually updated */
-#include <re_types.h>
-#include <re_mod.h>
-
-extern const struct mod_export exports_cons;
-extern const struct mod_export exports_g711;
-extern const struct mod_export exports_mda;
-
-const struct mod_export *mod_table[] = {
- &exports_cons,
- &exports_g711,
- &exports_mda,
- NULL
-};
diff --git a/modules/mda/mda.c b/modules/mda/mda.c
deleted file mode 100644
index 208facc..0000000
--- a/modules/mda/mda.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file mda.c Symbian MDA audio driver
- *
- * Copyright (C) 2010 Creytiv.com
- */
-#include <re.h>
-#include <baresip.h>
-#include "mda.h"
-
-
-static struct auplay *auplay;
-static struct ausrc *ausrc;
-
-
-static int module_init(void)
-{
- int err;
-
- err = auplay_register(&auplay, "mda", mda_player_alloc);
- err |= ausrc_register(&ausrc, "mda", mda_recorder_alloc);
-
- return err;
-}
-
-
-static int module_close(void)
-{
- auplay = mem_deref(auplay);
- ausrc = mem_deref(ausrc);
-
- return 0;
-}
-
-
-EXPORT_SYM const struct mod_export DECL_EXPORTS(mda) = {
- "mda",
- "audio",
- module_init,
- module_close,
-};
diff --git a/modules/mda/mda.h b/modules/mda/mda.h
deleted file mode 100644
index eee41d9..0000000
--- a/modules/mda/mda.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @file mda.h Symbian MDA audio driver -- Internal interface
- *
- * Copyright (C) 2010 Creytiv.com
- */
-
-
-int mda_player_alloc(struct auplay_st **stp, struct auplay *ap,
- struct auplay_prm *prm, const char *device,
- auplay_write_h *wh, void *arg);
-int mda_recorder_alloc(struct ausrc_st **stp, struct ausrc *as,
- struct media_ctx **ctx,
- struct ausrc_prm *prm, const char *device,
- ausrc_read_h *rh, ausrc_error_h *errh, void *arg);
-
-int convert_srate(uint32_t srate);
-int convert_channels(uint8_t ch);
diff --git a/modules/mda/player.cpp b/modules/mda/player.cpp
deleted file mode 100644
index 4cfa18c..0000000
--- a/modules/mda/player.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * @file player.cpp Symbian MDA audio driver -- player
- *
- * Copyright (C) 2010 Creytiv.com
- */
-#include <e32def.h>
-#include <e32std.h>
-#include <mdaaudiooutputstream.h>
-#include <mda/common/audio.h>
-
-extern "C" {
-#include <re.h>
-#include <baresip.h>
-#include "mda.h"
-
-#define DEBUG_MODULE "player"
-#define DEBUG_LEVEL 5
-#include <re_dbg.h>
-}
-
-
-enum {VOLUME = 100};
-
-class mda_player;
-struct auplay_st {
- struct auplay *ap; /* inheritance */
- mda_player *mda;
- auplay_write_h *wh;
- void *arg;
-};
-
-
-class mda_player : public MMdaAudioOutputStreamCallback, public CBase
-{
-public:
- mda_player(struct auplay_st *st, struct auplay_prm *prm);
- ~mda_player();
- void play();
-
- /* from MMdaAudioOutputStreamCallback */
- virtual void MaoscOpenComplete(TInt aError);
- virtual void MaoscBufferCopied(TInt aError, const TDesC8& aBuffer);
- virtual void MaoscPlayComplete(TInt aError);
-
-private:
- CMdaAudioOutputStream *iOutput;
- TMdaAudioDataSettings iSettings;
- TBool iIsReady;
- TBuf8<320> iBuf;
- struct auplay_st *state;
-};
-
-
-mda_player::mda_player(struct auplay_st *st, struct auplay_prm *prm)
- :iIsReady(EFalse)
-{
- state = st;
-
- iBuf.FillZ(320);
-
- iSettings.iSampleRate = convert_srate(prm->srate);
- iSettings.iChannels = convert_channels(prm->ch);
- iSettings.iVolume = VOLUME;
-
- iOutput = CMdaAudioOutputStream::NewL(*this);
- iOutput->Open(&iSettings);
-}
-
-
-mda_player::~mda_player()
-{
- if (iOutput) {
- iOutput->Stop();
- delete iOutput;
- }
-}
-
-
-void mda_player::play()
-{
- /* call write handler here */
- state->wh((uint8_t *)&iBuf[0], iBuf.Length(), state->arg);
-
- TRAPD(ret, iOutput->WriteL(iBuf));
- if (KErrNone != ret) {
- DEBUG_WARNING("WriteL left with %d\n", ret);
- }
-}
-
-
-void mda_player::MaoscOpenComplete(TInt aError)
-{
- if (KErrNone != aError) {
- iIsReady = EFalse;
- DEBUG_WARNING("mda player error: %d\n", aError);
- return;
- }
-
- iOutput->SetAudioPropertiesL(iSettings.iSampleRate,
- iSettings.iChannels);
- iOutput->SetPriority(EMdaPriorityNormal,
- EMdaPriorityPreferenceTime);
-
- iIsReady = ETrue;
-
- play();
-}
-
-
-/*
- * Note: In reality, this function is called approx. 1 millisecond after the
- * last block was played, hence we have to generate buffer N+1 while buffer N
- * is playing.
- */
-void mda_player::MaoscBufferCopied(TInt aError, const TDesC8& aBuffer)
-{
- (void)aBuffer;
-
- if (KErrNone != aError && KErrCancel != aError) {
- DEBUG_WARNING("MaoscBufferCopied [aError=%d]\n", aError);
- }
- if (aError == KErrAbort) {
- DEBUG_NOTICE("player aborted\n");
- return;
- }
-
- play();
-}
-
-
-void mda_player::MaoscPlayComplete(TInt aError)
-{
- if (KErrNone != aError) {
- DEBUG_WARNING("MaoscPlayComplete [aError=%d]\n", aError);
- }
-}
-
-
-static void auplay_destructor(void *arg)
-{
- struct auplay_st *st = (struct auplay_st *)arg;
-
- delete st->mda;
-
- mem_deref(st->ap);
-}
-
-
-int mda_player_alloc(struct auplay_st **stp, struct auplay *ap,
- struct auplay_prm *prm, const char *device,
- auplay_write_h *wh, void *arg)
-{
- struct auplay_st *st;
- int err = 0;
-
- (void)device;
-
- st = (struct auplay_st *)mem_zalloc(sizeof(*st), auplay_destructor);
- if (!st)
- return ENOMEM;
-
- st->ap = (struct auplay *)mem_ref(ap);
- st->wh = wh;
- st->arg = arg;
-
- st->mda = new mda_player(st, prm);
- if (!st->mda)
- err = ENOMEM;
-
- if (err)
- mem_deref(st);
- else
- *stp = st;
-
- return err;
-}
diff --git a/modules/mda/recorder.cpp b/modules/mda/recorder.cpp
deleted file mode 100644
index 6c358dc..0000000
--- a/modules/mda/recorder.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * @file recorder.cpp Symbian MDA audio driver -- recorder
- *
- * Copyright (C) 2010 Creytiv.com
- */
-#include <e32def.h>
-#include <e32std.h>
-#include <mdaaudioinputstream.h>
-#include <mda/common/audio.h>
-
-extern "C" {
-#include <re.h>
-#include <baresip.h>
-#include "mda.h"
-
-#define DEBUG_MODULE "recorder"
-#define DEBUG_LEVEL 5
-#include <re_dbg.h>
-}
-
-
-enum {VOLUME = 100};
-
-class mda_recorder;
-struct ausrc_st {
- struct ausrc *as; /* inheritance */
- mda_recorder *mda;
- ausrc_read_h *rh;
- void *arg;
-};
-
-
-class mda_recorder : public MMdaAudioInputStreamCallback, public CBase
-{
-public:
- mda_recorder(struct ausrc_st *st, struct ausrc_prm *prm);
- ~mda_recorder();
-
- /* from MMdaAudioInputStreamCallback */
- virtual void MaiscOpenComplete(TInt aError);
- virtual void MaiscBufferCopied(TInt aError, const TDesC8& aBuffer);
- virtual void MaiscRecordComplete(TInt aError);
-
-private:
- CMdaAudioInputStream *iInput;
- TMdaAudioDataSettings iSettings;
- TBool iIsReady;
- TBuf8<320> iBuf;
- struct ausrc_st *state;
-};
-
-
-mda_recorder::mda_recorder(struct ausrc_st *st, struct ausrc_prm *prm)
- :iIsReady(EFalse)
-{
- state = st;
-
- iInput = CMdaAudioInputStream::NewL(*this);
-
- iSettings.iSampleRate = convert_srate(prm->srate);
- iSettings.iChannels = convert_channels(prm->ch);
- iSettings.iVolume = VOLUME;
-
- iInput->Open(&iSettings);
-}
-
-
-mda_recorder::~mda_recorder()
-{
- if (iInput) {
- iInput->Stop();
- delete iInput;
- }
-}
-
-
-void mda_recorder::MaiscOpenComplete(TInt aError)
-{
- if (KErrNone != aError) {
- DEBUG_WARNING("MaiscOpenComplete %d\n", aError);
- return;
- }
-
- iInput->SetGain(iInput->MaxGain());
- iInput->SetAudioPropertiesL(iSettings.iSampleRate,
- iSettings.iChannels);
- iInput->SetPriority(EMdaPriorityNormal,
- EMdaPriorityPreferenceTime);
-
- TRAPD(ret, iInput->ReadL(iBuf));
- if (KErrNone != ret) {
- DEBUG_WARNING("ReadL left with %d\n", ret);
- }
-}
-
-
-void mda_recorder::MaiscBufferCopied(TInt aError, const TDesC8& aBuffer)
-{
- if (KErrNone != aError) {
- DEBUG_WARNING("MaiscBufferCopied: error=%d %d bytes\n",
- aError, aBuffer.Length());
- return;
- }
-
- state->rh(aBuffer.Ptr(), aBuffer.Length(), state->arg);
-
- iBuf.Zero();
- TRAPD(ret, iInput->ReadL(iBuf));
- if (KErrNone != ret) {
- DEBUG_WARNING("ReadL left with %d\n", ret);
- }
-}
-
-
-void mda_recorder::MaiscRecordComplete(TInt aError)
-{
- DEBUG_NOTICE("MaiscRecordComplete: error=%d\n", aError);
-
-#if 0
- if (KErrOverflow == aError) {
-
- /* re-open input stream */
- iInput->Stop();
- iInput->Open(&iSettings);
- }
-#endif
-}
-
-
-static void ausrc_destructor(void *arg)
-{
- struct ausrc_st *st = (struct ausrc_st *)arg;
-
- delete st->mda;
-
- mem_deref(st->as);
-}
-
-
-int mda_recorder_alloc(struct ausrc_st **stp, struct ausrc *as,
- struct media_ctx **ctx,
- struct ausrc_prm *prm, const char *device,
- ausrc_read_h *rh, ausrc_error_h *errh, void *arg)
-{
- struct ausrc_st *st;
- int err = 0;
-
- (void)ctx;
- (void)device;
- (void)errh;
-
- st = (struct ausrc_st *)mem_zalloc(sizeof(*st), ausrc_destructor);
- if (!st)
- return ENOMEM;
-
- st->as = (struct ausrc *)mem_ref(as);
- st->rh = rh;
- st->arg = arg;
-
- st->mda = new mda_recorder(st, prm);
- if (!st->mda)
- err = ENOMEM;
-
- if (err)
- mem_deref(st);
- else
- *stp = st;
-
- return err;
-}
diff --git a/modules/mda/util.cpp b/modules/mda/util.cpp
deleted file mode 100644
index b879c7f..0000000
--- a/modules/mda/util.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @file util.cpp Symbian MDA audio driver -- utilities
- *
- * Copyright (C) 2010 Creytiv.com
- */
-#include <e32def.h>
-#include <e32std.h>
-#include <mda/common/audio.h>
-
-extern "C" {
-#include <re.h>
-#include <baresip.h>
-#include "mda.h"
-}
-
-
-int convert_srate(uint32_t srate)
-{
- switch (srate) {
-
- case 8000: return TMdaAudioDataSettings::ESampleRate8000Hz;
- case 12000: return TMdaAudioDataSettings::ESampleRate12000Hz;
- case 16000: return TMdaAudioDataSettings::ESampleRate16000Hz;
- case 24000: return TMdaAudioDataSettings::ESampleRate24000Hz;
- case 32000: return TMdaAudioDataSettings::ESampleRate32000Hz;
- default: return -1;
- }
-}
-
-
-int convert_channels(uint8_t ch)
-{
- switch (ch) {
-
- case 1: return TMdaAudioDataSettings::EChannelsMono;
- case 2: return TMdaAudioDataSettings::EChannelsStereo;
- default: return -1;
- }
-}