1 files changed, 39 insertions, 48 deletions

diff --git a/main/src/control/ivug-parameter.h b/main/src/control/ivug-parameter.h
index 1de14c4..7a97336 100755
--- a/main/src/control/ivug-parameter.h
+++ b/main/src/control/ivug-parameter.h
@@ -1,94 +1,85 @@
-/*
- * Copyright 2012  Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *	  http://www.tizenopensource.org/license
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*

+ * Copyright 2012  Samsung Electronics Co., Ltd

+ *

+ * Licensed under the Flora License, Version 1.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ *	  http://www.tizenopensource.org/license

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

 
 #ifndef __IVUG_PARAMETER_H__
 #define __IVUG_PARAMETER_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdbool.h>
-#include <bundle.h>
+#include <app.h>
+#include "ivug-datatypes.h"
 
 typedef enum {
 	IVUG_MODE_INVAILD = 0x00,
-	IVUG_MODE_NORMAL, 				// normal
+	IVUG_MODE_NORMAL,
 	IVUG_MODE_SINGLE,				// just show one slide
 	IVUG_MODE_DISPLAY,				// from "take a photo" in messenger
 	IVUG_MODE_FILE,					// file viewer(can flick)
 	IVUG_MODE_CAMERA,				// camera(can flick)
 	IVUG_MODE_SETAS,				// SetAs in setting menu.
+	IVUG_MODE_SLIDESHOW,			// Slideshow
 } ivug_mode;
 
-typedef enum {
-	IVUG_VIEW_BY_INVAILD = 0x00,
-	IVUG_VIEW_BY_FILE,
-	IVUG_VIEW_BY_ALL,
-	IVUG_VIEW_BY_FOLDER,
-	IVUG_VIEW_BY_PLACES,
-} ivug_view_by;
-
 //set as ug
 typedef enum {
 	IVUG_SET_AS_UG_TYPE_INVALID = 0x00,
 	IVUG_SET_AS_UG_TYPE_WALLPAPER,
+	IVUG_SET_AS_UG_TYPE_CALLER_ID,
+	IVUG_SET_AS_UG_TYPE_VIDEO_CALL_ID,
+	IVUG_SET_AS_UG_TYPE_CROP,			// For OSP
+	IVUG_SET_AS_UG_TYPE_WALLPAPER_ONLY,
 	IVUG_SET_AS_UG_TYPE_MAX,
 } ivug_setas_type;
 
-typedef enum {
-	IVUG_MEDIA_TYPE_ALL = 0x00, //default value
-	IVUG_MEDIA_TYPE_IMAGE,
-	IVUG_MEDIA_TYPE_VIDEO,
-	IVUG_MEDIA_TYPE_MAX,
-} ivug_media_type;
-
-typedef enum {
-	IVUG_MEDIA_SORT_NONE = 0x00,  /**< No sort */
-	IVUG_MEDIA_ASC_BY_NAME,     	/**< Ascending sort as file name */
-	IVUG_MEDIA_DESC_BY_NAME,   	/**< Descending sort as file name */
-	IVUG_MEDIA_ASC_BY_DATE,     	/**< Ascending sort as created date */
-	IVUG_MEDIA_DESC_BY_DATE,    	/**< Descending sort as created date */
-} ivug_sort_type;
-
 typedef struct {
 	ivug_mode mode;
+	ivug_setas_type setas_type;		// Only needed when mode is IVUG_MODE_SETAS
+
+	bool bStandalone;	// launched by appsvc
+
+	ivug_view_by view_by;
 
 	char* filepath;
 	UUID album_id;	//cluster id of media service
 
-	ivug_view_by view_by;
-	ivug_setas_type setas_type;
 	ivug_media_type media_type;
 	ivug_sort_type sort_type;		// TODO : extract from here. sort type can be used in case of default
 
 	/* for places view */
+	bool footsteps;
 	double max_longitude;
 	double min_longitude;
 	double max_latitude;
 	double min_latitude;
 
+	/* for set as view crop box*/
+	unsigned int width;
+	unsigned int height;
+	bool bRatioFix;
+
 	int start_index;
 
 } ivug_parameter;
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 ivug_parameter*
-ivug_param_create_from_bundle(bundle* b);
+ivug_param_create_from_bundle(service_h service);
 
 void
 ivug_param_delete(ivug_parameter* data);