From: Andre Noll <maan@systemlinux.org>
Date: Sun, 13 Jul 2014 14:20:56 +0000 (+0200)
Subject: Merge branch 't/gui_sched'
X-Git-Tag: v0.5.3~12
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=d15d8509bcb56d6a40f2709c28cc6c9cc1f6739a;hp=-c

Merge branch 't/gui_sched'

Was cooking for two months, since 2014-05-11.

* t/gui_sched: (53 commits)
  gui: Always initialize theme.
  gui: Simplify color handling.
  gui: Dont catch SIGWINCH.
  gui: Call waitpid() from exec and status task.
  Doxify para_gui.
  gui: Speed up window refresh.
  gui: Rename cmd_task to exec_task.
  gui: Move static variables of cmd_post_select() into struct cmd_task.
  gui: Move some variables into struct status_task.
  gui: Switch to the standard paraslash scheduler.
  gui: Use cpp magic to define command handlers.
  gui: Execute stat command in status_post_select().
  gui: Rename COMMAND/EXTERNAL/GETCH mode.
  gui: Get rid of do_select()'s mode parameter and call it only once.
  gui: Reorder functions.
  gui: Move signal handling code out of do_select().
  gui: Move input related code out of do_select().
  gui: Move external command handling out of do_select().
  gui: Introduce status_post_select().
  gui: Improve config reload.
  ...
---

d15d8509bcb56d6a40f2709c28cc6c9cc1f6739a
diff --combined NEWS
index f6fca566,7cf5dca2..c613d672
--- a/NEWS
+++ b/NEWS
@@@ -5,15 -5,7 +5,16 @@@ NEW
  0.5.3 (to be released) "symbolic synchronization"
  -------------------------------------------------
  
++	- para_gui has been converted to use the paraslash scheduler.
  	- Various alsa-related fixes, mostly for the raspberry pi.
 +	- The test suite has been extended to include sanity checks
 +	  for the generated man pages.
 +	- ao_writer fixes. This writer was in a quite bad shape. Many
 +	  serious bugs have been fixed.
 +	- new audiod command: version.
 +	- Minor improvements to the bitstream API.
 +	- The cpsi command now prints a meaningful error message if
 +	  none of the given patterns matched any audio file.
  
  ----------------------------------------
  0.5.2 (2014-04-11) "orthogonal interior"
diff --combined error.h
index dc9385a7,0f542a83..e91f49b4
--- a/error.h
+++ b/error.h
@@@ -16,10 -16,10 +16,9 @@@ DEFINE_ERRLIST_OBJECT_ENUM
  #define TIME_ERRORS
  #define CLOSE_ON_FORK_ERRORS
  #define DAEMON_ERRORS
- #define GUI_ERRORS
  #define GUI_THEME_ERRORS
  #define RINGBUFFER_ERRORS
  #define SCORE_ERRORS
 -#define RBTREE_ERRORS
  #define RECV_ERRORS
  #define IPC_ERRORS
  #define DCCP_SEND_ERRORS
@@@ -86,6 -86,8 +85,8 @@@ extern const char **para_errlist[]
  	PARA_ERROR(FLACDEC_DECODER_INIT, "could not init stream decoder"), \
  	PARA_ERROR(FLACDEC_EOF, "flacdec encountered end of file condition"), \
  
+ #define GUI_ERRORS \
+ 	PARA_ERROR(GUI_SIGCHLD, "received SIGCHLD"), \
  
  #define FLAC_AFH_ERRORS \
  	PARA_ERROR(FLAC_CHAIN_ALLOC, "could not create metadata chain"), \
@@@ -180,7 -182,6 +181,7 @@@
  	PARA_ERROR(AO_PLAY, "ao_play() failed"), \
  	PARA_ERROR(AO_BAD_SAMPLE_FORMAT, "ao: unsigned sample formats not supported"), \
  	PARA_ERROR(AO_PTHREAD, "pthread error"), \
 +	PARA_ERROR(AO_EOF, "ao: end of file"), \
  
  
  #define COMPRESS_FILTER_ERRORS \