Updated changes and updated version to stable.

diff --git a/CHANGES.txt b/CHANGES.txt
index 6f843cad9e4c2ebea7068d6a8b8767a45563302c..d23d0d3a6feab91ff8f11cf2b1b65f105dea416b 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 C H A N G E S\r
 \r
-CasparCG Server 2.0.7 (as compared to CasparCG Server 2.0.7 Beta 2)\r
-===================================================================\r
+CasparCG Server 2.0.7 Stable (as compared to CasparCG Server 2.0.7 Beta 2)\r
+==========================================================================\r
 \r
 General\r
 -------\r
@@ -15,9 +15,11 @@ General
     empty/late first frame when the producer is called before the consumer in\r
     the other end has received the first frame.\r
   o Added rudimentary support for audio for layer_producer and channel_producer.\r
-  o Upgraded Decklink SDK to 10.1.4, bringing new 2K and 4K DCI video modes.\r
+  o Upgraded Decklink SDK to 10.1.4, bringing new 2K and 4K DCI video modes. New\r
+    template hosts also availble for those modes.\r
   o General bug fixes (mostly memory and resource leaks, some serious).\r
   o Updated Boost to version 1.57\r
+  o Frontend no longer maintained and therefore not included in the release.\r
 \r
 Mixer\r
 -----\r
@@ -78,6 +80,10 @@ Consumers
     and its usefulness was questionable.\r
   o Added a 10 second time-out for consumer sends, to detect/recover from\r
     blocked consumers.\r
+  o Some consumers which are usually added and removed during playout (for\r
+    example ffmpeg_consumer, streaming_consumer and channel_consumer) no longer\r
+    affect the presentation time on other consumers. Previously a lag on the SDI\r
+    output could be seen when adding such consumers.\r
 \r
 HTML producer\r
 -------------\r
@@ -107,7 +113,7 @@ Producers
 ---------\r
 \r
   o FFmpeg: Reports correct nb_frames() when using SEEK (Thomas Kaltz III)\r
-  o Flash: Fixed bug wherer CG PLAY, CG INVOKE\r
+  o Flash: Fixed bug where CG PLAY, CG INVOKE did not work.\r
 \r
 Consumers\r
 ---------\r

diff --git a/README.txt b/README.txt
index bae38506eb61b2ba4c56424528f0432fc0a9f9fc..769a809eab53f2836519e712c8304f2f521f2131 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,13 +1,12 @@
-CasparCG Server 2.0.7 Beta 2\r
+CasparCG Server 2.0.7 Stable\r
 ============================\r
 \r
 Thank you for your interest in CasparCG Server, a professional software used to\r
 play out and record professional graphics, audio and video to multiple outputs.\r
 It has been in 24/7 broadcast production since 2006.\r
 \r
-This release is NOT considered tested and stable, and it is NOT intended for use\r
-in professional production. Please use CasparCG Server 2.0.6 if you need \r
-proven stability!\r
+This release is considered tested and stable, and is intended for use in\r
+professional production.\r
 \r
 More information is available at http://casparcg.com/\r
 \r
@@ -50,7 +49,7 @@ INSTALLATION
 \r
 1. Check that your system meets the requirements above.\r
 \r
-2. Unzip and place the "CasparCG Server 2.0.7 Beta 2" folder anywhere you like.\r
+2. Unzip and place the "CasparCG Server" folder anywhere you like.\r
 \r
 3. Install "Microsoft Visual C++ 2010 Redistributable Package" from\r
    http://www.microsoft.com/download/en/details.aspx?id=5555\r
@@ -62,11 +61,11 @@ INSTALLATION
    as they can interfere with CasparCG Server's OpenGL features!\r
 \r
 \r
-\r
 INSTALLATION OF ADDITIONAL NON-GPL SOFTWARE\r
 -------------------------------------------\r
 \r
 - For Flash template support:\r
+\r
   1. Uninstall any previous version of the Adobe Flash Player using this file:\r
      http://download.macromedia.com/get/flashplayer/current/support/uninstall_flash_player.exe\r
   2. Download and unpack\r
@@ -74,7 +73,6 @@ INSTALLATION OF ADDITIONAL NON-GPL SOFTWARE
   3. Install Adobe Flash Player 11.8.800.94 from the unpacked archive:\r
      fp_11.8.800.94_archive\11_8_r800_94\flashplayer11_8r800_94_winax.exe\r
 \r
-\r
 - For NewTek iVGA support, please download and install the following driver:\r
   http://new.tk/NetworkSendRedist\r
 \r
@@ -82,14 +80,13 @@ INSTALLATION OF ADDITIONAL NON-GPL SOFTWARE
 CONFIGURATION\r
 -------------\r
 \r
-1. Start the "CasparCG_Server.exe" program and configure the settings. Then \r
-   Click the "Restart" button to save the configuration and restart\r
-   the CasparCG Server software.\r
-\r
-2. Connect to the Server from a client software, such as the "CasparCG Client"\r
-   which is available as a separate download.\r
+1. Configure the server by editing the self documented casparcg.config file in a\r
+   text editor.\r
 \r
+2. Start the "casparcg.exe" program.\r
 \r
+3. Connect to the Server from a client software, such as the "CasparCG Client"\r
+   which is available as a separate download.\r
 \r
 \r
 DOCUMENTATION\r
@@ -101,7 +98,6 @@ http://casparcg.com/wiki/
 Ask questions in the forum: http://casparcg.com/forum/\r
 \r
 \r
-\r
 LICENSING\r
 ---------\r
 \r

diff --git a/version.tmpl b/version.tmpl
index 69a1a83e75ed3d8591e8f91d39bac710001f711d..401c74af177cc5c2a3d1c46d08551a6e0f85c970 100644 (file)
--- a/version.tmpl
+++ b/version.tmpl
@@ -1,4 +1,4 @@
 #define CASPAR_GEN 2\r
 #define CASPAR_MAYOR 0\r
 #define CASPAR_MINOR 7\r
-#define CASPAR_TAG "Beta2"\r
+#define CASPAR_TAG "Stable"\r