Merge branch 'master' of github.com:ksterker/adonthell

src/audio/Makefile.am

@@ -51,21 +51,21 @@ _sdl_la_DEPENDENCIES = libadonthell_audio.la
 
 ## Unit tests
 test_CXXFLAGS = $(libgmock_CFLAGS) $(libgtest_CFLAGS)
-test_LDADD    = $(libgmock_LIBS)   $(libgtest_LIBS)
+test_LDADD    = $(libgmock_LIBS)   $(libgtest_LIBS) $(top_builddir)/src/audio/libadonthell_audio.la
 
-test_audio_SOURCES  = $(libadonthell_audio_la_SOURCES)  test_audio.cc
+test_audio_SOURCES  = test_audio.cc
 test_audio_CXXFLAGS = $(libadonthell_audio_la_CXXFLAGS) $(test_CXXFLAGS)
 test_audio_LDADD    = $(libadonthell_audio_la_LIBADD)   $(test_LDADD)
 
-test_audio_event_SOURCES  = $(libadonthell_audio_la_SOURCES)  test_audio_event.cc
+test_audio_event_SOURCES  = test_audio_event.cc
 test_audio_event_CXXFLAGS = $(libadonthell_audio_la_CXXFLAGS) $(test_CXXFLAGS)
 test_audio_event_LDADD    = $(libadonthell_audio_la_LIBADD)   $(test_LDADD)
 
-test_audio_manager_SOURCES  = $(libadonthell_audio_la_SOURCES)  test_audio_manager.cc
+test_audio_manager_SOURCES  = test_audio_manager.cc
 test_audio_manager_CXXFLAGS = $(libadonthell_audio_la_CXXFLAGS) $(test_CXXFLAGS)
 test_audio_manager_LDADD    = $(libadonthell_audio_la_LIBADD)   $(test_LDADD)
 
-test_sound_SOURCES  = $(libadonthell_audio_la_SOURCES)  test_sound.cc
+test_sound_SOURCES  = test_sound.cc
 test_sound_CXXFLAGS = $(libadonthell_audio_la_CXXFLAGS) $(test_CXXFLAGS)
 test_sound_LDADD    = $(libadonthell_audio_la_LIBADD)   $(test_LDADD)
 

src/audio/audio_manager.cc

@@ -90,13 +90,4 @@ namespace audio
         return true;
     }
 
-    bool audio_manager::set_sound_dir(const std::string sound_dir) {
-        LOG(INFO) << "set_sound_dir(" << sound_dir << "); was: "
-                  << sound_dir_;
-
-        sound_dir_ = sound_dir;
-
-        return true;
-    }
-
 } // namespace{}

src/audio/audio_manager.h

@@ -85,10 +85,6 @@ namespace audio
          */ 
         static const int get_audio_rate() { return audio_rate_; }
 
-        /** @return sound_dir  directory in which sound files reside
-         */ 
-        static const std::string get_sound_dir() { return sound_dir_; }
-
         /** Sets the audio buffer size
          *
          *  @param audio_buffers  size of audio buffer, in bytes
@@ -125,13 +121,6 @@ namespace audio
          */ 
         static bool set_audio_rate(const int audio_rate = DEFAULT_AUDIO_RATE);
 
-        /** Sets the directory in which sound files reside
-         *
-         *  @param sound_dir  directory in which sound files reside
-         *  @return  true on success, false otherwise
-         */ 
-        static bool set_sound_dir(const std::string sound_dir = DEFAULT_SOUND_DIR);
-
     protected:
         static int     audio_buffers_;
         static int     audio_channels_;

src/audio/sound.cc

@@ -28,6 +28,7 @@
 
 #include <string>
 
+#include "base/base.h"
 #include "audio/audio.h"
 #include "audio/audio_manager.h"
 #include "audio/sound.h"
@@ -49,12 +50,17 @@ sound::sound (const std::string &filename)
     LOG(INFO) << logging::indent() << "sound::sound(" << filename << ") called";
     logging::increment_log_indent_level();
 
-    std::string sound_dir = audio_manager::get_sound_dir();
-    LOG(INFO) << logging::indent() << "sound_dir: '" << sound_dir << "'";
-
-    m_filename = sound_dir + filename;
-    open_file();
-
+    m_filename = "audio/" + filename;
+    if (base::Paths.find_in_path (m_filename))
+    {
+        open_file();
+    }
+    else
+    {
+        m_channel = -1;
+        m_sample = NULL;
+    }
+
     logging::decrement_log_indent_level();
 }
 

src/audio/test_audio_event.cc

@@ -67,23 +67,23 @@ namespace audio
     }; // class{}
 
     TEST_F(audio_event_Test, constructor_Default) {
-        EXPECT_EQ("foo.ogg", ev->sample().getfilename());
+        EXPECT_EQ("audio/foo.ogg", ev->sample().getfilename());
     }
 
     TEST_F(audio_event_Test, put_state_Filename) {
-        EXPECT_EQ("foo.ogg", ev->sample().getfilename());
+        EXPECT_EQ("audio/foo.ogg", ev->sample().getfilename());
 
         base::flat f;
         ev->put_state(f);
 
         sound_noop  *s2  = new sound_noop("bar.ogg");
         audio_event *ev2 = new audio_event(s2);
 
-        EXPECT_EQ("bar.ogg", ev2->sample().getfilename());
+        EXPECT_EQ("audio/bar.ogg", ev2->sample().getfilename());
 
         ev2->get_state(f);
 
-        EXPECT_EQ("foo.ogg", ev2->sample().getfilename());
+        EXPECT_EQ("audio/foo.ogg", ev2->sample().getfilename());
 
         delete ev2;
         delete s2;

src/audio/test_audio_manager.cc

@@ -86,12 +86,6 @@ namespace audio
         EXPECT_EQ(DEFAULT_AUDIO_RATE, audio_manager::get_audio_rate());
     }
 
-    TEST_F(audio_manager_Test, set_sound_dir_Default) {
-        audio_manager::set_sound_dir();
-
-        EXPECT_EQ(DEFAULT_SOUND_DIR, audio_manager::get_sound_dir());
-    }
-
     TEST_F(audio_manager_Test, set_audio_buffers) {
         audio_manager::set_audio_buffers(27);
 
@@ -122,12 +116,6 @@ namespace audio
         EXPECT_EQ(27, audio_manager::get_audio_rate());
     }
 
-    TEST_F(audio_manager_Test, set_sound_dir) {
-        audio_manager::set_sound_dir("27");
-
-        EXPECT_EQ("27", audio_manager::get_sound_dir());
-    }
-
 } // namespace{}
 
 

src/audio/test_sound.cc

@@ -64,19 +64,19 @@ namespace audio
     }; // class{}
 
     TEST_F(sound_Test, constructor_Default) {
-        EXPECT_EQ("foo.ogg", s->getfilename());
+        EXPECT_EQ("audio/foo.ogg", s->getfilename());
     }
 
     TEST_F(sound_Test, put_state_Filename) {
-        EXPECT_EQ("foo.ogg", s->getfilename());
+        EXPECT_EQ("audio/foo.ogg", s->getfilename());
 
         base::flat f;
         s->put_state(f);
 
         sound_noop *s2 = new sound_noop();
         s2->get_state(f);
 
-        EXPECT_EQ("foo.ogg", s2->getfilename());
+        EXPECT_EQ("audio/foo.ogg", s2->getfilename());
         EXPECT_EQ(-1,        s2->get_channel());
 
         EXPECT_FALSE(s2->get_forcedhalt());

src/main/adonthell.cc

@@ -118,14 +118,6 @@ bool app::init_modules (const u_int16 & modules)
     if (m & AUDIO)
     {
         audio::setup (Cfg);
-        audio::audio_manager::set_sound_dir(Userdatadir + "/" + Game + "/audio/");
-
-        LOG(INFO) << logging::indent()
-                  << "audio::audio_manager::sound_dir: '"
-                  << audio::audio_manager::get_sound_dir()
-                  << "'"
-            ;
-
         if (!audio::init (Backend)) {
             LOG(ERROR) << logging::indent() << "audio::init() failed";
 

src/py-runtime/Makefile.am

@@ -1,6 +1,6 @@
 AM_CXXFLAGS = -I$(top_srcdir)/src
 EXTRA_DIST = py_runtime.i CMakeLists.txt
-CLEANFILES = $(top_srcdir)/src/py-wrappers/runtime/py_*_wrap.cc
+CLEANFILES = $(top_srcdir)/src/py-wrappers/runtime/py_runtime.cc
 
 ## SWIG runtime support
 lib_LTLIBRARIES = libadonthell_py_runtime.la

src/python/CMakeLists.txt

@@ -26,6 +26,15 @@ target_link_libraries(adonthell_python
     ${PYTHON_LIBRARIES}
     adonthell_base)
 
+################################
+# Unit tests
+IF(DEVBUILD)
+  add_executable(test_python test_python.cc)
+  target_link_libraries(test_python ${TEST_LIBRARIES} adonthell_python)
+  add_test(NAME Python COMMAND test_python)
+ENDIF(DEVBUILD)
+
+################################  
 # install
 adonthell_install_lib (adonthell_python)
 adonthell_install_include(python "${adonthell_python_HEADERS}") 

src/python/Makefile.am

@@ -27,3 +27,17 @@ libadonthell_python_la_CXXFLAGS = $(PY_CFLAGS) $(AM_CXXFLAGS)
 libadonthell_python_la_LIBADD = $(PY_LIBS) \
     $(top_builddir)/src/base/libadonthell_base.la \
     $(SWIGRUNTIME_LIBS) -lstdc++
+
+
+## Unit tests
+test_CXXFLAGS = $(libgmock_CFLAGS) $(libgtest_CFLAGS)
+test_LDADD    = $(libgmock_LIBS)   $(libgtest_LIBS) $(top_builddir)/src/python/libadonthell_python.la
+
+test_python_SOURCES  = test_python.cc
+test_python_CXXFLAGS = $(libadonthell_python_la_CXXFLAGS) $(test_CXXFLAGS)
+test_python_LDADD    = $(libadonthell_python_la_LIBADD)   $(test_LDADD)
+
+TESTS = \
+	test_python
+
+check_PROGRAMS = $(TESTS)

src/python/method.h

@@ -67,6 +67,12 @@ namespace python
          */
         std::string name () const;
 
+        /**
+         * Return name of enclosing script.
+         * @return script name.
+         */
+        std::string script () const { return Script->class_name(); }
+
         /**
          * Execute the connected %method with the given arguments.
          * @param args a python tuple to be passed to the %method.

src/python/python.cc

@@ -102,17 +102,55 @@ namespace python
         return ret;
     }
 
+    // pad tuple
+    PyObject *pad_tuple (PyObject *tuple, const u_int16 & len)
+    {
+        // make sure the given arguments are a tuple
+        if (tuple && !PyTuple_Check (tuple))
+        {
+            fprintf (stderr, "*** error: python::pad_tuple: argument must be a tuple!\n");
+            return NULL;
+        }
+
+        // calculate size of argument tuple required
+        u_int16 size = tuple ? PyTuple_GET_SIZE (tuple) + len : len;
+
+        // prepare callback arguments
+        PyObject *new_tuple = PyTuple_New (size);
+
+        // pad with none object
+        for (u_int16 i = 0; i < len; i++)
+        {
+            PyTuple_SET_ITEM (new_tuple, i, Py_None);
+        }
+
+        // copy remaining objects, if any
+        for (u_int16 i = len; i < size; i++)
+        {
+            PyObject *o = PyTuple_GET_ITEM (tuple, i - len);
+            Py_XINCREF (o);
+            PyTuple_SET_ITEM (new_tuple, i, o);
+        }
+
+        return new_tuple;
+    }
+
     // unflatten the contents of a tuple
     PyObject *get_tuple (base::flat & in, const u_int16 & start)
     {
         u_int16 len = in.get_uint16 ("pln") + start;
         PyObject *tuple = PyTuple_New (len);
         void *value;
-        
+
         for (u_int16 i = start; i < len; i++) 
         {
             switch (int type = in.next (&value)) 
             {
+                case base::flat::T_CHAR:
+                {
+                    PyTuple_SetItem (tuple, i, Py_None);
+                    break;
+                }
                 case base::flat::T_STRING:
                 {
                     // Stolen reference
@@ -147,10 +185,12 @@ namespace python
         {
             // Borrowed reference
             PyObject *item = PyTuple_GetItem (tuple, i);
+            if (item == NULL)
+                out.put_char ("n", ' ');
 
             // Check for the type of this object
             // String?
-            if (PyString_Check (item)) 
+            else if (PyString_Check (item)) 
                 out.put_string ("s", PyString_AsString (item));
 
             // Integer?

src/python/python.h

@@ -316,9 +316,19 @@ namespace python
     //@}
 
     /**
-     * @name Loading / Saving
+     * @name Convenience functions.
      */
     //@{
+    /**
+     * Pads the front of the given tuple, moving the existing
+     * entries to the end of the tuple. If the given tuple is
+     * NULL, returns a new tuple of size len. Reference count
+     * of the contents of the given tuple is increased by one.
+     *
+     * @return a new tuple or NULL on error.
+     */
+    PyObject *pad_tuple (PyObject *tuple, const u_int16 & len);
+
     /**
      * Read the contents of a tuple from given stream.
      * @param in flattener to read the tuple from.