rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=45d83111b162fdd38d2362ca62ad4916be8126f4

commit 45d83111b162fdd38d2362ca62ad4916be8126f4
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Wed Feb 3 12:11:44 2016 +0200

    sound_editor: rename this module to sound_manager
    
    Also delete tests for sound editor, because this tests
    not actual anymore. The tests are check only returned
    pointer. No sense to save that test. The sound manager
    need to test manual: eyes, hands, mouse and brain.
    
    Change-Id: I2776e1701d57c5c73212899d812cb7708d28a145
---
 po/POTFILES.in                                     |  2 +-
 src/bin/Makefile.am                                |  2 +-
 src/bin/ui/editors/sound_editor.h                  | 63 -----------------
 src/bin/ui/main_window.h                           | 30 ++++++++
 src/bin/ui/menu.c                                  |  2 -
 src/bin/ui/property_sound.c                        |  2 +-
 src/bin/ui/shortcuts/shortcuts.c                   |  1 -
 .../ui/{editors/sound_editor.c => sound_manager.c} |  3 +-
 src/bin/ui/tabs.c                                  |  3 +-
 tests/Makefile.am                                  |  8 ---
 tests/test_sound_editor/sound_editor_window_add.c  | 81 ----------------------
 tests/test_sound_editor/test_sound_editor.c        | 39 -----------
 tests/test_sound_editor/test_sound_editor.h        | 30 --------
 13 files changed, 35 insertions(+), 231 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index a6f1ba4..a0b7436 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,7 +16,7 @@ src/bin/ui/editors/animator_program_editor.c
 src/bin/ui/editors/animator_program_sequence.c
 src/bin/ui/colorclass_manager.c
 src/bin/ui/image_manager.c
-src/bin/ui/editors/sound_editor.c
+src/bin/ui/sound_manager.c
 src/bin/ui/style_manager.c
 src/bin/ui/live_view/elementary/live_actionslider.c
 src/bin/ui/live_view/elementary/live_bg.c
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 97ae1f1..8bf0f9e 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -39,7 +39,7 @@ libete_a_SOURCES = \
 ../../src/bin/ui/shortcuts/shortcuts.c \
 ../../src/bin/ui/container/container.c \
 ../../src/bin/ui/style_manager.c \
-../../src/bin/ui/editors/sound_editor.c \
+../../src/bin/ui/sound_manager.c \
 ../../src/bin/ui/dialogs/about_window.c \
 ../../src/bin/ui/dialogs/colorsel.c \
 ../../src/bin/ui/modal_window/modal_window.c \
diff --git a/src/bin/ui/editors/sound_editor.h 
b/src/bin/ui/editors/sound_editor.h
deleted file mode 100644
index f5da6a6..0000000
--- a/src/bin/ui/editors/sound_editor.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Edje Theme Editor
- * Copyright (C) 2013-2014 Samsung Electronics.
- *
- * This file is part of Edje Theme Editor.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
- */
-
-#ifndef SOUND_EDITOR_DIALOG_H
-#define SOUND_EDITOR_DIALOG_H
-
-/**
- * @defgroup Sound_Editor Sound_Editor
- * @ingroup Dialogs
- *
- * Show sounds and tones, which are used in project.
- */
-
-#include "eflete.h"
-#include "project_manager.h"
-
-#ifdef HAVE_AUDIO
-TODO("Check pulse_audio on configure and add COREAUDIO support")
-   #define HAVE_PULSE 1
-   #include <Ecore_Audio.h>
-#endif
-
-typedef enum {
-   SOUND_TYPE_SAMPLE,
-   SOUND_TYPE_TONE
-} Sound_Type;
-
-struct _Sound_Data {
-   Sound_Type type;
-   Resource *resource; /* for SAMPLE it's External_Resource, TONE - 
Tone_Resource */
-   Eina_Stringshare *name;
-   Eina_Stringshare *type_label;
-};
-typedef struct _Sound_Data Sound_Data;
-
-/**
- * Show the whole inwin window by using some data
- * about loaded project (edj file)
- *
- * @return the inwin object that contain sound viewer
- *
- * @ingroup Sound_Editor
- */
-Evas_Object *
-sound_editor_window_add(void);
-
-#endif  /* SOUND_EDITOR_DIALOG_H */
diff --git a/src/bin/ui/main_window.h b/src/bin/ui/main_window.h
index 6aa47e7..8cf9dc0 100644
--- a/src/bin/ui/main_window.h
+++ b/src/bin/ui/main_window.h
@@ -32,6 +32,12 @@
 #include "eflete.h"
 #include "widget_macro.h"
 
+#ifdef HAVE_AUDIO
+TODO("Check pulse_audio on configure and add COREAUDIO support")
+   #define HAVE_PULSE 1
+   #include <Ecore_Audio.h>
+#endif
+
 enum Menu_Item
 {
    /* Needed as parent for top level menu items and as end mark in items lists 
*/
@@ -479,4 +485,28 @@ typedef struct _Style_Data Style_Data;
 Evas_Object *
 style_manager_add();
 
+typedef enum {
+   SOUND_TYPE_SAMPLE,
+   SOUND_TYPE_TONE
+} Sound_Type;
+
+struct _Sound_Data {
+   Sound_Type type;
+   Resource *resource; /* for SAMPLE it's External_Resource, TONE - 
Tone_Resource */
+   Eina_Stringshare *name;
+   Eina_Stringshare *type_label;
+};
+typedef struct _Sound_Data Sound_Data;
+
+/**
+ * Add new sound manager layout object.
+ *
+ * @return Pointer to layout object, which contain list of sounds,
+ * control buttons, etc.
+ *
+ * @ingroup Window
+ */
+Evas_Object *
+sound_manager_add(void);
+
 #endif /* UI_MAIN_WINDOW_H */
diff --git a/src/bin/ui/menu.c b/src/bin/ui/menu.c
index f2a7e5a..c62adeb 100644
--- a/src/bin/ui/menu.c
+++ b/src/bin/ui/menu.c
@@ -19,8 +19,6 @@
 
 #include "main_window.h"
 #include "preference.h"
-#include "sound_editor.h"
-#include "animator.h"
 #include "about_window.h"
 #include "tabs.h"
 #include "workspace.h"
diff --git a/src/bin/ui/property_sound.c b/src/bin/ui/property_sound.c
index 2034542..9505a4c 100644
--- a/src/bin/ui/property_sound.c
+++ b/src/bin/ui/property_sound.c
@@ -23,8 +23,8 @@
 #include "property_private.h"
 #include "property_macros.h"
 #include "main_window.h"
+#include "project_manager.h"
 #include "history.h"
-#include "sound_editor.h"
 #include "validator.h"
 
 #define UPDATE_FREQUENCY 1.0 / 30.0
diff --git a/src/bin/ui/shortcuts/shortcuts.c b/src/bin/ui/shortcuts/shortcuts.c
index 6b80c59..4d05400 100644
--- a/src/bin/ui/shortcuts/shortcuts.c
+++ b/src/bin/ui/shortcuts/shortcuts.c
@@ -19,7 +19,6 @@
 
 #include "shortcuts.h"
 #include "main_window.h"
-#include "sound_editor.h"
 #include "animator.h"
 #include "tabs.h"
 #include "workspace.h"
diff --git a/src/bin/ui/editors/sound_editor.c b/src/bin/ui/sound_manager.c
similarity index 99%
rename from src/bin/ui/editors/sound_editor.c
rename to src/bin/ui/sound_manager.c
index ae02fdd..ff342e4 100644
--- a/src/bin/ui/editors/sound_editor.c
+++ b/src/bin/ui/sound_manager.c
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
  */
-#include "sound_editor.h"
 #include "main_window.h"
 #include "project_manager.h"
 #include "modal_window.h"
@@ -630,7 +629,7 @@ _sound_editor_main_markup_create(Sound_Editor *edit)
 }
 
 Evas_Object *
-sound_editor_window_add(void)
+sound_manager_add(void)
 {
    Sound_Editor *edit;
 
diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c
index 6c5449a..032f330 100644
--- a/src/bin/ui/tabs.c
+++ b/src/bin/ui/tabs.c
@@ -25,7 +25,6 @@
 #include "main_window.h"
 #include "change.h"
 
-#include "sound_editor.h"
 #include "animator.h"
 
 struct _Tabs_Item {
@@ -383,7 +382,7 @@ _project_opened(void *data __UNUSED__,
                 void *ei __UNUSED__)
 {
    tabs.menu.content_image_editor = image_manager_add();
-   tabs.menu.content_sound_editor = sound_editor_window_add();
+   tabs.menu.content_sound_editor = sound_manager_add();
    tabs.menu.content_text_editor = style_manager_add();
    tabs.menu.content_colorclass_editor = colorclass_manager_add();
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b4c4521..0074f27 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,7 +12,6 @@ colorclass_manager_test \
 diff_test \
 change_test \
 new_history_test \
-sound_editor_test \
 image_manager_test \
 logger_test \
 container_test \
@@ -176,13 +175,6 @@ colorclass_manager_test_SOURCES = \
 colorclass_manager_test_CFLAGS = ${FLAGS}
 colorclass_manager_test_LDADD = ${LD}
 
-sound_editor_test_SOURCES = \
-../tests/test_sound_editor/test_sound_editor.c \
-../tests/test_sound_editor/sound_editor_window_add.c
-
-sound_editor_test_CFLAGS = ${FLAGS}
-sound_editor_test_LDADD = ${LD}
-
 image_manager_test_SOURCES = \
 ../tests/test_image_manager/test_image_manager.c \
 ../tests/test_image_manager/image_manager_add.c
diff --git a/tests/test_sound_editor/sound_editor_window_add.c 
b/tests/test_sound_editor/sound_editor_window_add.c
deleted file mode 100644
index 283d2f1..0000000
--- a/tests/test_sound_editor/sound_editor_window_add.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Edje Theme Editor
- * Copyright (C) 2013-2014 Samsung Electronics.
- *
- * This file is part of Edje Theme Editor.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
- */
-
-#include "test_sound_editor.h"
-#include "test_common.h"
-
-/**
- * @addtogroup sound_editor_test
- * @{
- * @addtogroup sound_editor_window_add
- * @{
- * sound_editor
- * <TABLE>
- * @}
- */
-
-/**
- * @addtogroup sound_editor_window_add
- * @{
- * <tr>
- * <td>sound_editor_window_add</td>
- * <td>sound_editor_window_add_test_p</td>
- * <td>
- * @precondition
- * @step 1 init elemantary
- * @step 2 init app
- * @step 3 create main window
- * @step 4 load project
- *
- * @procedure
- * @step 1 Call sound_editor_window_add()
- * @step 2 Check returned pointer
- * </td>
- * <td>No data</td>
- * <td>returned pointer is not NULL</td>
- * </tr>
- * @}
- */
-EFLETE_TEST(sound_editor_window_add_test_p)
-{
-   elm_init(0,0);
-
-   Evas_Object *sounds;
-
-   app_init();
-   ui_main_window_add();
-   ap.project = setup("sound_editor_window_add_test_p");
-
-   sounds = sound_editor_window_add();
-   ck_assert_msg(sounds != NULL, "cannot create sound editor window");
-
-   evas_object_del(sounds);
-   app_shutdown();
-   teardown("./sound_editor_window_add_test_p");
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup sound_editor_window_add
- * @{
- * </TABLE>
- * @}
- * @}
- */
diff --git a/tests/test_sound_editor/test_sound_editor.c 
b/tests/test_sound_editor/test_sound_editor.c
deleted file mode 100644
index 55d6bcd..0000000
--- a/tests/test_sound_editor/test_sound_editor.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Edje Theme Editor
- * Copyright (C) 2013-2014 Samsung Electronics.
- *
- * This file is part of Edje Theme Editor.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
- */
-
-#include "test_sound_editor.h"
-
-Suite* test_suite (void) {
-   Suite *suite = suite_create("test_sound_editor");
-   TCase *tcase = tcase_create("TCase");
-   tcase_add_test(tcase, sound_editor_window_add_test_p);
-   suite_add_tcase(suite, tcase);
-   return suite;
-}
-
-int main(void) {
-   int number_failed;
-   Suite *suite = test_suite();
-   SRunner *runner = srunner_create(suite);
-   srunner_set_xml(runner, "test_sound_editor.xml");
-   srunner_run_all(runner, CK_VERBOSE);
-   number_failed = srunner_ntests_failed(runner);
-   srunner_free(runner);
-   return number_failed;
-}
diff --git a/tests/test_sound_editor/test_sound_editor.h 
b/tests/test_sound_editor/test_sound_editor.h
deleted file mode 100644
index 6b04385..0000000
--- a/tests/test_sound_editor/test_sound_editor.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Edje Theme Editor
- * Copyright (C) 2013-2014 Samsung Electronics.
- *
- * This file is part of Edje Theme Editor.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
- */
-
-#include "utc_common.h"
-#include "sound_editor.h"
-#include "main_window.h"
-
-/**
- * @defgroup sound_editor_test
- */
-
-#define TEST_NAME "sound_editor"
-
-void sound_editor_window_add_test_p(int);

-- 


Reply via email to