r3260 - in trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2: . images src
abraxa at sita.openmoko.org
abraxa at sita.openmoko.org
Tue Oct 23 21:57:25 CEST 2007
Author: abraxa
Date: 2007-10-23 21:57:21 +0200 (Tue, 23 Oct 2007)
New Revision: 3260
Removed:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/background.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/btn-white-p.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/btn-white.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-left.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-right.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-repeat-all.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-repeat-current.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-repeat-off.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-repeat-once.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-shuffle-off.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-shuffle-on.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-time.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-track.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-00.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-01.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-02.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-03.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-04.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-05.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-06.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-07.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-08.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-09.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-10.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-11.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-12.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan--1.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan--2.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan--3.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan-0.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan-1.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan-2.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan-3.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-00.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-01.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-02.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-03.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-04.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-05.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-06.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-07.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-08.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-09.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-10.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/slider-bar.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/slider_btn.png
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/TODO
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/main_page.c
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.c
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.h
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playback.h
Log:
Fix alignment of label #2 when #1 is hidden (frame surrounding label #1 was still visible)
Drop now unneeded images
Add GConf support, part I
Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/TODO
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/TODO 2007-10-23 18:29:32 UTC (rev 3259)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/TODO 2007-10-23 19:57:21 UTC (rev 3260)
@@ -16,6 +16,7 @@
Issues:
Reduce call frequency of omp_playback_get_track_length()
+ Investigate on occasional segfault when terminating after video playback with gstreamer
Documentation:
Update wiki
Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac 2007-10-23 18:29:32 UTC (rev 3259)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac 2007-10-23 19:57:21 UTC (rev 3260)
@@ -11,7 +11,6 @@
AC_STDC_HEADERS
AC_PROG_LIBTOOL
AC_PROG_INTLTOOL([0.35.0])
-#AM_GCONF_SOURCE_2
dnl i18n support
GETTEXT_PACKAGE=AC_PACKAGE_NAME
@@ -20,7 +19,7 @@
AM_GLIB_GNU_GETTEXT
-# Check for GTK/GLib/GThread/Pango, dbus, OpenMoko libs, gstreamer, expat, uriparser and XSPF
+# Check for required libraries
PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.4.0 gtk+-2.0 >= 2.4.0 gthread-2.0 pango],,
AC_MSG_ERROR([*** Cannot find glib2/gtk2/gthread/pango ***]))
@@ -32,12 +31,15 @@
#PKG_CHECK_MODULES(OPENMOKO, [openmoko-libs >= 0.1.0],,
# AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.1.0 not installed ***]))
+PKG_CHECK_MODULES(GCONF, [gconf-2.0],,
+ AC_MSG_ERROR([*** Cannot find gconf ***]))
+
PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10 >= 0.10],,
AC_MSG_ERROR([*** Cannot find gstreamer ***]))
# gstinterfaces-0.10 is contained in libgstximagesink - which in turn is
# contained in gst-plugins-base. So if we have gstreamer we also have gstinterfaces-0.10
-LIBS="$GTK_LIBS $OPENMOKO_LIBS $GSTREAMER_LIBS $LIBS -lgstinterfaces-0.10"
+LIBS="$GTK_LIBS $OPENMOKO_LIBS $GSTREAMER_LIBS $GCONF_LIBS $LIBS -lgstinterfaces-0.10"
LIBS="-lexpat $LIBS"
AC_CHECK_LIB(expat, XML_Parse, , [echo "Error: libexpat not found"; exit -1])
@@ -52,7 +54,7 @@
AC_CHECK_LIB(mokoui2, moko_stock_register, , [echo "Error: libmokoui2 not found"; exit -1])
-CFLAGS="$OPENMOKO_CFLAGS $GSTREAMER_CFLAGS $CFLAGS"
+CFLAGS="$OPENMOKO_CFLAGS $GSTREAMER_CFLAGS $GCONF_CFLAGS $CFLAGS"
localedir=$datadir/locale
AC_SUBST(localedir)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/background.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/btn-white-p.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/btn-white.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-left.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-right.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-repeat-all.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-repeat-current.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-repeat-off.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-repeat-once.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-shuffle-off.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-shuffle-on.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-time.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-track.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-00.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-01.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-02.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-03.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-04.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-05.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-06.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-07.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-08.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-09.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-10.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-11.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-eq-12.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan--1.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan--2.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan--3.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan-0.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan-1.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan-2.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-pan-3.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-00.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-01.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-02.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-03.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-04.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-05.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-06.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-07.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-08.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-09.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ind-music-volume-10.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/slider-bar.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/slider_btn.png
===================================================================
(Binary files differ)
Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/main_page.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/main_page.c 2007-10-23 18:29:32 UTC (rev 3259)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/main_page.c 2007-10-23 19:57:21 UTC (rev 3260)
@@ -52,6 +52,7 @@
GtkWidget *cover_eventbox;
GtkWidget *cover_frame;
GtkWidget *label1;
+ GtkWidget *label1_frame;
GtkWidget *label2;
GtkWidget *label3;
GtkWidget *track_number_label;
@@ -420,7 +421,7 @@
if (omp_config_get_main_ui_show_cover())
{
gtk_image_set_from_stock(GTK_IMAGE(main_widgets.cover_image), "no_cover", -1);
- gtk_widget_queue_draw(main_widgets.cover_image); // Re-draw the default cover
+ gtk_widget_queue_draw(main_widgets.cover_image); // Re-draw the cover as it might have been used as video display before
}
// Determine which label we can use for showing the "No track information" line
@@ -508,8 +509,8 @@
gtk_widget_set_name(GTK_WIDGET(main_widgets.label1), "omp-main-top-label1");
gtk_label_set_ellipsize(GTK_LABEL(main_widgets.label1), PANGO_ELLIPSIZE_END);
gtk_misc_set_alignment(GTK_MISC(main_widgets.label1), 0, 0);
- label = widget_wrap(main_widgets.label1, NULL);
- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ main_widgets.label1_frame = widget_wrap(main_widgets.label1, NULL);
+ gtk_box_pack_start(GTK_BOX(vbox), main_widgets.label1_frame, FALSE, FALSE, 0);
main_widgets.label2 = gtk_label_new(NULL);
gtk_widget_set_name(GTK_WIDGET(main_widgets.label2), "omp-main-top-label2");
@@ -533,7 +534,7 @@
// Show all widgets, then hide the ones we don't want visible
gtk_widget_show_all(GTK_WIDGET(frame));
- if (omp_config_get_main_ui_label1() == OMP_MAIN_LABEL_HIDDEN) gtk_widget_hide(main_widgets.label1);
+ if (omp_config_get_main_ui_label1() == OMP_MAIN_LABEL_HIDDEN) gtk_widget_hide(main_widgets.label1_frame);
if (omp_config_get_main_ui_label2() == OMP_MAIN_LABEL_HIDDEN) gtk_widget_hide(main_widgets.label2);
if (omp_config_get_main_ui_label3() != OMP_MAIN_LABEL_HIDDEN) gtk_widget_show_all(label3);
Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.c 2007-10-23 18:29:32 UTC (rev 3259)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.c 2007-10-23 19:57:21 UTC (rev 3260)
@@ -26,6 +26,7 @@
#include <glib.h>
#include <glib/gstdio.h>
+#include <gconf/gconf-client.h>
#include <string.h>
#include <stdlib.h>
@@ -42,7 +43,7 @@
#include "playlist.h"
#include "playback.h"
-/// The default configuration
+/// The literal de-fault configuration, will only be used if gconf is unavailable or schema file wasn't installed
struct _omp_config omp_default_config =
{
FALSE, // shuffle
@@ -55,20 +56,28 @@
TRUE, // main_ui_show_cover
OMP_MAIN_LABEL_HIDDEN, // main_ui_label1
OMP_MAIN_LABEL_ARTIST, // main_ui_label2
- OMP_MAIN_LABEL_TITLE // main_ui_label3
+ OMP_MAIN_LABEL_TITLE, // main_ui_label3
+ 15, // main_min_gesture_radius
+ 750, // main_gesture_repeat_tresh
+ 1000, // main_gesture_repeat_intv
};
struct _omp_config *omp_config = NULL; ///< Global and persistent configuration data
struct _omp_session *omp_session = NULL; ///< Global and persistent session data
+/// The GConf instance we'll use
+GConfClient *omp_gconf_client;
+
/**
* Initalize and load application configuration data
*/
void
omp_config_init()
{
+ GError *error = NULL;
+
#ifdef DEBUG
g_print("Loading application configuration\n");
#endif
@@ -76,7 +85,7 @@
// This mustn't be called more than once
g_assert(!omp_config);
- // Set default config
+ // Set de-fault config
omp_config = g_new(struct _omp_config, 1);
g_memmove(omp_config, &omp_default_config, sizeof(struct _omp_config));
@@ -89,7 +98,53 @@
G_TYPE_OBJECT, G_SIGNAL_RUN_FIRST, 0, 0, NULL,
g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT);
- /// @todo GConf implementation
+ // Fetch values from GConf
+ omp_gconf_client = gconf_client_get_default();
+ gconf_client_preload(omp_gconf_client, OMP_GCONF_PATH, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+
+ omp_config->shuffle =
+ gconf_client_get_bool(omp_gconf_client, OMP_GCONF_PATH "/shuffle", &error);
+
+ if (error)
+ {
+ g_printerr("GConf error: %s\nWill continue execution, though program might behave abnormal.\n", error->message);
+ g_error_free(error);
+
+ return;
+ }
+
+ omp_config->repeat_mode =
+ gconf_client_get_int(omp_gconf_client, OMP_GCONF_PATH "/repeat_mode", NULL);
+
+ omp_config->resume_playback =
+ gconf_client_get_bool(omp_gconf_client, OMP_GCONF_PATH "/resume_playback", NULL);
+
+ omp_config->prev_track_treshold =
+ gconf_client_get_int(omp_gconf_client, OMP_GCONF_PATH "/prev_track_treshold", NULL);
+
+ omp_config->show_numbers_in_pl =
+ gconf_client_get_bool(omp_gconf_client, OMP_GCONF_PATH "/show_numbers_in_playlist", NULL);
+
+ omp_config->main_ui_show_cover =
+ gconf_client_get_bool(omp_gconf_client, OMP_GCONF_PATH "/show_cover_art", NULL);
+
+ omp_config->main_ui_label1 =
+ gconf_client_get_int(omp_gconf_client, OMP_GCONF_PATH "/main_label1_type", NULL);
+
+ omp_config->main_ui_label2 =
+ gconf_client_get_int(omp_gconf_client, OMP_GCONF_PATH "/main_label2_type", NULL);
+
+ omp_config->main_ui_label3 =
+ gconf_client_get_int(omp_gconf_client, OMP_GCONF_PATH "/main_label3_type", NULL);
+
+ omp_config->main_min_gesture_radius =
+ gconf_client_get_int(omp_gconf_client, OMP_GCONF_PATH "/min_gesture_radius", NULL);
+
+ omp_config->main_gesture_repeat_tresh =
+ gconf_client_get_int(omp_gconf_client, OMP_GCONF_PATH "/gesture_repeat_tresh", NULL);
+
+ omp_config->main_gesture_repeat_intv =
+ gconf_client_get_int(omp_gconf_client, OMP_GCONF_PATH "/gesture_repeat_intv", NULL);
}
/**
@@ -98,6 +153,7 @@
void
omp_config_free()
{
+ g_object_unref(G_OBJECT(omp_gconf_client));
g_free(omp_config);
}
Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.h 2007-10-23 18:29:32 UTC (rev 3259)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.h 2007-10-23 19:57:21 UTC (rev 3260)
@@ -47,8 +47,11 @@
// Where to find the playlist files relative to the user's home directory?
#define OMP_RELATIVE_PLAYLIST_PATH "/playlists"
+// GConf path in which we will store our configuration settings
+#define OMP_GCONF_PATH "/apps/openmoko/mediaplayer"
+
/// Application configuration data
/// @note Default values are taken from omp_default_config
/// @note Update that struct as well if you make changes here!
@@ -65,6 +68,9 @@
guint main_ui_label1; ///< Contents of main UI's label #1
guint main_ui_label2; ///< Contents of main UI's label #2
guint main_ui_label3; ///< Contents of main UI's label #3
+ guint main_min_gesture_radius; ///< If a gesture stroke's length is shorter than this the gesture is dismissed
+ guint main_gesture_repeat_tresh; ///< If a gesture was made its action will be repeated if the finger is still down after this time (msec)
+ guint main_gesture_repeat_intv; ///< Gesture will be repeated every X milliseconds
};
/// Session-persistent data
Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playback.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playback.h 2007-10-23 18:29:32 UTC (rev 3259)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playback.h 2007-10-23 19:57:21 UTC (rev 3260)
@@ -44,6 +44,8 @@
// The UI will be updated at this interval when a track is playing (in ms)
#define PLAYBACK_UI_UPDATE_INTERVAL 1000
+
+
gboolean omp_playback_init();
void omp_playback_free();
void omp_playback_save_state();
More information about the commitlog
mailing list
