#include <libosso.h>
#include <osso-log.h>
-#include <hildon-widgets/hildon-program.h>
-#include <hildon-widgets/hildon-window.h>
+#include <hildon/hildon-program.h>
+#include <hildon/hildon-window.h>
#include <gconf/gconf-client.h>
#include <gtk/gtk.h>
#define SERVICE_NAME_FULL "com.nokia.maemo_recorder"
#define DEFAULT_CHANNELS 1
-#define DEFAULT_RATE 8000
+#define DEFAULT_RATE 16000
#define GST_TYPE_ILBC "audio/x-iLBC"
#define ILBC_RATE DEFAULT_RATE
*/
/* 13.33 kbps for 30 ms frames */
#define ILBC_BITRATE_20 15200
+#define ILBC_BITRATE_30 13300
+
/* 8000 Hz * 8 bits/sample */
#define PCMA_BITRATE 64000
#define PCMU_BITRATE 64000
#define GST_TYPE_PCMA "audio/x-alaw"
#define GST_TYPE_PCMU "audio/x-mulaw"
#define GST_TYPE_PCM "audio/x-raw-int"
-#define PCM_RATE 8000
+#define PCM_RATE 16000
#define PCM_WIDTH 16
#define PCM_DEPTH 16
#define PCM_ENDIANNESS 1234
{
APPSTATE_READY = 1,
APPSTATE_PLAYING,
- APPSTATE_RECORDING
+ APPSTATE_RECORDING,
+ APPSTATE_PAUSED
} AppState;
typedef enum
#define FORMAT_NAME_WAV "WAV"
#define FORMAT_NAME_PCMA "PCM A-law"
-#define FORMAT_NAME_PCMU "PCM u-law"
+#define FORMAT_NAME_PCMU "PCM \u03BC-law"
+/*
+#define FORMAT_NAME_PCMU "PCM mu-law"
+*/
+#define FORMAT_NAME_PCM "PCM raw"
#define FORMAT_NAME_ILBC "iLBC"
+#define PLAY_ICON "/usr/share/pixmaps/recorder/play.png"
+#define REC_ICON "/usr/share/pixmaps/recorder/record.png"
+#define STOP_ICON "/usr/share/pixmaps/recorder/stop.png"
+
+#define DEFAULT_TMP_DIR "/home/user/MyDocs/.recorder"
+
/* TODO: this kind of struct might be more handy when passing around audioformat info */
#if 0
struct _AudioFormatSpec
GtkWidget *fileNameEntry;
GtkWidget *lengthEntry;
GtkWidget *stateEntry;
+ GtkWidget *formatEntry;
GtkObject *adjustment;
-
+ GtkWidget *ctime;
} mainViewStr;
typedef struct _AppDataStr
GtkWidget *buttonPlay;
GtkWidget *buttonRec;
- struct timeval recStartTv; /* timeval when recording started */
guint recUpdateId; /* g_source_id for rec update timeout func */
gchar *mimeURI; /* uri to open via mime cb */
-
+ gdouble rectime;
} AppData;
void setAppState(AppData *app, AppState state);