merged with master
This commit is contained in:
+36
-1
@@ -120,7 +120,10 @@ namespace olive {
|
||||
PROJECT_VIEW_TREE,
|
||||
|
||||
/** Display project media in icon browser */
|
||||
PROJECT_VIEW_ICON
|
||||
PROJECT_VIEW_ICON,
|
||||
|
||||
/** Display project media in list browser */
|
||||
PROJECT_VIEW_LIST
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -413,6 +416,13 @@ struct Config {
|
||||
*/
|
||||
bool seek_also_selects;
|
||||
|
||||
/**
|
||||
* @brief Automatically seek to the beginning of a sequence if the user plays beyond the end of it
|
||||
*
|
||||
* TRUE if this behavior should be enabled.
|
||||
*/
|
||||
bool auto_seek_to_beginning;
|
||||
|
||||
/**
|
||||
* @brief CSS Path
|
||||
*
|
||||
@@ -558,6 +568,31 @@ struct Config {
|
||||
*/
|
||||
bool use_native_menu_styling;
|
||||
|
||||
/**
|
||||
* @brief Default Sequence video width
|
||||
*/
|
||||
int default_sequence_width;
|
||||
|
||||
/**
|
||||
* @brief Default Sequence video height
|
||||
*/
|
||||
int default_sequence_height;
|
||||
|
||||
/**
|
||||
* @brief Default Sequence video frame rate
|
||||
*/
|
||||
double default_sequence_framerate;
|
||||
|
||||
/**
|
||||
* @brief Default Sequence audio frequency
|
||||
*/
|
||||
int default_sequence_audio_frequency;
|
||||
|
||||
/**
|
||||
* @brief Default Sequence audio channel layout
|
||||
*/
|
||||
int default_sequence_audio_channel_layout;
|
||||
|
||||
/**
|
||||
* @brief Load config from file
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user