Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
cb56d7e8
Commit
cb56d7e8
authored
Dec 17, 2009
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Solved wizzard non replicated settings problem
Removed debug.
parent
7c12a1b5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
10 deletions
+1
-10
src/Configuration/SettingsManager.cpp
src/Configuration/SettingsManager.cpp
+0
-10
src/GUI/wizard/VideoPage.cpp
src/GUI/wizard/VideoPage.cpp
+1
-0
No files found.
src/Configuration/SettingsManager.cpp
View file @
cb56d7e8
...
...
@@ -64,9 +64,7 @@ void SettingsManager::setValue( const QString& part , const QString& key, const
{
m_globalLock
.
lockForRead
();
if
(
!
m_tempData
.
contains
(
part
)
)
{
addNewSettingsPart
(
part
);
}
m_globalLock
.
unlock
();
QWriteLocker
lock
(
&
m_globalLock
);
SettingsPart
*
tmp
=
m_tempData
[
part
];
...
...
@@ -94,7 +92,6 @@ void SettingsManager::saveSettings( const QString& part, QDomDocument& xmlfile,
m_globalLock
.
lockForRead
();
if
(
!
m_data
.
contains
(
part
)
)
{
qDebug
()
<<
"no part named"
<<
part
;
m_globalLock
.
unlock
();
return
;
}
...
...
@@ -176,7 +173,6 @@ void SettingsManager::commit()
{
SettingsPart
*
sett
=
it
.
value
();
QString
part
=
it
.
key
();
qDebug
()
<<
">>>>Commiting part:"
<<
part
;
QReadLocker
rLock
(
&
sett
->
m_lock
);
SettingsPart
::
ConfigPair
::
iterator
iter
=
sett
->
m_data
.
begin
();
...
...
@@ -188,15 +184,9 @@ void SettingsManager::commit()
SettingsPart
::
ConfigPair
::
iterator
insert_it
=
m_data
[
part
]
->
m_data
.
find
(
settingName
);
if
(
insert_it
==
m_data
[
part
]
->
m_data
.
end
()
)
{
qDebug
()
<<
"Inserting new value:"
<<
settingName
;
m_data
[
part
]
->
m_data
.
insert
(
settingName
,
new
SettingValue
(
iter
.
value
()
->
get
()
)
);
}
else
{
qDebug
()
<<
"Modifying new value:"
<<
settingName
;
m_data
[
part
]
->
m_data
[
settingName
]
->
set
(
iter
.
value
()
->
get
()
);
}
}
}
}
...
...
src/GUI/wizard/VideoPage.cpp
View file @
cb56d7e8
...
...
@@ -105,6 +105,7 @@ bool VideoPage::validatePage()
sManager
->
setValue
(
"project"
,
"VideoProjectFPS"
,
projectFps
);
sManager
->
setValue
(
"project"
,
"VideoProjectHeight"
,
projectHeight
);
sManager
->
setValue
(
"project"
,
"VideoProjectWidth"
,
projectWidth
);
sManager
->
commit
();
return
true
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment