From 83e7ab880f956dcafc748e88d8dcc7dfa22f5859 Mon Sep 17 00:00:00 2001
From: Casey Langen <casey.langen@gmail.com>
Date: Sun, 7 May 2017 22:36:28 -0700
Subject: [PATCH] Version bump to 0.13.0.

---
 CHANGELOG.txt                         |  19 +++++++++++++++++++
 CMakeLists.txt                        |   4 ++--
 src/contrib/websocket_remote/main.cpp |   2 +-
 src/musikbox/app/util/Version.h       |   2 +-
 src/musikbox/musikbox.rc              | Bin 5096 -> 5096 bytes
 src/musikdroid/app/build.gradle       |   4 ++--
 6 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2bc31c2c6..90ba542ea 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,22 @@
+0.13.0
+
+user-facing:
+
+* added on-demand audio transcoding (downsampling) to the http server. users
+  can configure transcoding in the `musikdroid` client.
+* fixed a bug in album id handling to properly support multiple albums with the
+  same name by different artists (this was only half working before).
+* added ssl support to the `musikdroid` client, and instructions on the wiki
+  for enabling ssl on the server-side.
+* added `buffering` indicators to `musikdroid`.
+
+low-level:
+
+* added missing IBuffer::Destroy method, and added IEnvironment::GetBuffer so
+  plugins can decode audio data.
+
+--------------------------------------------------------------------------------
+
 0.12.1
 
 user-facing:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bfdc6faa..c8ec6b19f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ cmake_minimum_required(VERSION 3.0)
 
 project(musikbox)
 set (musikbox_VERSION_MAJOR 0)
-set (musikbox_VERSION_MINOR 12)
-set (musikbox_VERSION_PATCH 1)
+set (musikbox_VERSION_MINOR 13)
+set (musikbox_VERSION_PATCH 0)
 set (musikbox_VERSION "${musikbox_VERSION_MAJOR}.${musikbox_VERSION_MINOR}.${musikbox_VERSION_PATCH}")
 
 include(ExternalProject)
diff --git a/src/contrib/websocket_remote/main.cpp b/src/contrib/websocket_remote/main.cpp
index 892e40c7c..a4fb6e14e 100644
--- a/src/contrib/websocket_remote/main.cpp
+++ b/src/contrib/websocket_remote/main.cpp
@@ -57,7 +57,7 @@ static class Plugin : public IPlugin {
     public:
         virtual void Destroy() { }
         virtual const char* Name() { return "WebSockets IPlaybackRemote"; }
-        virtual const char* Version() { return "0.2.0"; }
+        virtual const char* Version() { return "0.5.0"; }
         virtual const char* Author() { return "clangen"; }
         virtual int SdkVersion() { return musik::core::sdk::SdkVersion; }
 } plugin;
diff --git a/src/musikbox/app/util/Version.h b/src/musikbox/app/util/Version.h
index 8603e1cf1..3db6d6e04 100644
--- a/src/musikbox/app/util/Version.h
+++ b/src/musikbox/app/util/Version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION "0.12.0"
+#define VERSION "0.13.0"
diff --git a/src/musikbox/musikbox.rc b/src/musikbox/musikbox.rc
index fde4b2be455cc245a767afd7de5fb3e84102d800..4e0617d60a26b21cfe6458f6e3af464030b3226f 100644
GIT binary patch
delta 57
zcmaE%{z84jIxbdY1|0^2$(y<KA*{{Mxh^sRnR*NcoA>hmWP~s$@8y-A{DNO-@e6(y
E0Pueh`Tzg`

delta 57
zcmaE%{z84jIxbct1|0^&$(y<KA*{{Mxh^sRnR*O{oA>hmWP~s$@8y-A{DNO-@e6(y
E0Pt@R`Tzg`

diff --git a/src/musikdroid/app/build.gradle b/src/musikdroid/app/build.gradle
index db7e95004..165ed09c6 100644
--- a/src/musikdroid/app/build.gradle
+++ b/src/musikdroid/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "io.casey.musikcube.remote"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 5
-        versionName "0.5.1"
+        versionCode 6
+        versionName "0.6.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }