bigger icons, tmpdir

[maemo-recorder] / src / maemo-recorder.h

diff --git a/src/maemo-recorder.h b/src/maemo-recorder.h
index 7f8ade9..35e6196 100644 (file)
--- a/src/maemo-recorder.h
+++ b/src/maemo-recorder.h
@@ -25,8 +25,9 @@
 
 #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>
 #include <gst/gst.h>
@@ -36,7 +37,7 @@
 #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
@@ -47,6 +48,8 @@
  */
 /* 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
@@ -54,7 +57,7 @@
 #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
@@ -63,7 +66,8 @@ typedef enum
 {
     APPSTATE_READY = 1,
     APPSTATE_PLAYING,
-    APPSTATE_RECORDING
+    APPSTATE_RECORDING,
+    APPSTATE_PAUSED
 } AppState;
 
 typedef enum
@@ -77,6 +81,21 @@ typedef enum
     FORMAT_WAV
 } AudioFormat;
 
+#define FORMAT_NAME_WAV "WAV"
+#define FORMAT_NAME_PCMA "PCM A-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
@@ -107,8 +126,9 @@ typedef struct _mainViewStr
     GtkWidget *fileNameEntry;
     GtkWidget *lengthEntry;
     GtkWidget *stateEntry;
+    GtkWidget *formatEntry;
     GtkObject *adjustment;
-
+    GtkWidget *ctime;
 } mainViewStr;
 
 typedef struct _AppDataStr
@@ -126,6 +146,7 @@ typedef struct _AppDataStr
     gint playPipelineType;
 
     osso_context_t *osso;
+    GConfClient *gconf_client;
 
     gchar * openFileName;
     gchar * saveFileName;
@@ -145,10 +166,9 @@ 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);