libshared: Updated to 899975acd75ff96cce80c35cc2eecf61ea9d4871

src/CMakeLists.txt

@@ -12,7 +12,6 @@ set (timew_SRCS CLI.cpp        CLI.h
                 Extensions.cpp Extensions.h
                 Interval.cpp   Interval.h
                 Lexer.cpp      Lexer.h
-                Palette.cpp    Palette.h
                 Range.cpp      Range.h
                 Rules.cpp      Rules.h
                 data.cpp
@@ -29,6 +28,7 @@ set (libshared_SRCS libshared/src/Args.cpp          libshared/src/Args.h
                     libshared/src/FS.cpp            libshared/src/FS.h
                     libshared/src/JSON.cpp          libshared/src/JSON.h
                     libshared/src/Msg.cpp           libshared/src/Msg.h
+                    libshared/src/Palette.cpp       libshared/src/Palette.h
                     libshared/src/Pig.cpp           libshared/src/Pig.h
                     libshared/src/RX.cpp            libshared/src/RX.h
                     libshared/src/Table.cpp         libshared/src/Table.h

src/Palette.cpp

@@ -1,82 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2015 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <Palette.h>
-
-////////////////////////////////////////////////////////////////////////////////
-// Use a default palette, which is overwritten in ::initialize.
-Palette::Palette ()
-{
-  _colors = {
-    Color ("white on red"),
-    Color ("white on blue"),
-    Color ("black on green"),
-    Color ("black on magenta"),
-    Color ("black on cyan"),
-    Color ("black on yellow"),
-    Color ("black on white"),
-    Color ("white on bright red"),
-    Color ("white on bright blue"),
-    Color ("black on bright green"),
-    Color ("black on bright magenta"),
-    Color ("black on bright cyan"),
-    Color ("black on bright yellow"),
-  };
-
-  _current = 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Palette::add (Color c)
-{
-  _colors.push_back (c);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Return the next color in the list.  Cycle to the beginning if necessary.
-Color Palette::next ()
-{
-  if (enabled)
-    return _colors[_current++ % _colors.size ()];
-
-  return Color ();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int Palette::size () const
-{
-  return static_cast <int> (_colors.size ());
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Palette::clear ()
-{
-  _colors.clear ();
-  _current = 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////

src/Palette.h

@@ -1,51 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2015 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_PALETTE
-#define INCLUDED_PALETTE
-
-#include <Color.h>
-#include <vector>
-#include <string>
-
-class Palette
-{
-public:
-  Palette ();
-  void add (Color);
-  Color next ();
-  int size () const;
-  void clear ();
-
-public:
-  bool enabled {true};
-
-private:
-  std::vector <Color> _colors  {};
-  int                 _current {0};
-};
-
-#endif

src/libshared

@@ -1 +1 @@
-Subproject commit 0efc143498fceb4a80fb79af6198125aed0d9bc4
+Subproject commit 899975acd75ff96cce80c35cc2eecf61ea9d4871