Refactors EncodingConfigurationImpl

cusax-fix
Boris Grozev 13 years ago
parent 0c1e691d86
commit b709a4b516

@ -36,8 +36,6 @@ public class EncodingConfigurationTableModel
private MediaFormat[] encodings;
private final MediaType type;
private final boolean autoUpdateConfig;
/**
* Constructor.
@ -46,14 +44,11 @@ public class EncodingConfigurationTableModel
* @param type media type
*/
public EncodingConfigurationTableModel(int type,
EncodingConfiguration encodingConfiguration,
boolean autoUpdateConfig)
EncodingConfiguration encodingConfiguration)
{
if (encodingConfiguration == null)
throw new IllegalArgumentException("encodingConfiguration");
this.encodingConfiguration = encodingConfiguration;
this.autoUpdateConfig = autoUpdateConfig;
switch (type)
{
@ -255,8 +250,7 @@ private void setPriorities(int[] priorities)
throw new IllegalArgumentException("priorities");
for (int i = 0; i < count; i++)
{
encodingConfiguration.setPriority(encodings[i], priorities[i],
autoUpdateConfig);
encodingConfiguration.setPriority(encodings[i], priorities[i]);
}
}
@ -274,8 +268,7 @@ public void setValueAt(Object value, int rowIndex, int columnIndex)
// property in order to have more reactive user interface.
fireTableCellUpdated(rowIndex, columnIndex);
encodingConfiguration.setPriority(encoding, priority,
autoUpdateConfig);
encodingConfiguration.setPriority(encoding, priority);
}
}
}

@ -604,7 +604,7 @@ private Component createControls(int type)
container.insertTab(
res.getI18NString("impl.media.configform.ENCODINGS"),
null,
createEncodingControls(type, null, true),
createEncodingControls(type, null),
null,
1);
}
@ -633,8 +633,7 @@ private Component createControls(int type)
*/
public Component createEncodingControls(
MediaType mediaType,
EncodingConfiguration encodingConfiguration,
boolean autoUpdateConfig)
EncodingConfiguration encodingConfiguration)
{
if(encodingConfiguration == null)
{
@ -661,8 +660,7 @@ public Component createEncodingControls(
return
createEncodingControls(
deviceConfigurationComboBoxModelType,
encodingConfiguration,
autoUpdateConfig);
encodingConfiguration);
}
/**
@ -671,8 +669,7 @@ public Component createEncodingControls(
* @return the component.
*/
private Component createEncodingControls(int type,
EncodingConfiguration encodingConfiguration,
boolean autoUpdateConfig)
EncodingConfiguration encodingConfiguration)
{
if(encodingConfiguration == null)
{
@ -712,8 +709,7 @@ private Component createEncodingControls(int type,
container.add(parentButtonBar, BorderLayout.EAST);
table.setModel(new EncodingConfigurationTableModel(type,
encodingConfiguration,
autoUpdateConfig));
encodingConfiguration));
/*
* The first column contains the check boxes which enable/disable their
* associated encodings and it doesn't make sense to make it wider than

@ -109,11 +109,9 @@ public EncodingsPanel()
.getMediaService().getCurrentEncodingConfiguration());
audioControls = mediaConfiguration.
createEncodingControls(MediaType.AUDIO,
encodingConfiguration, false);
createEncodingControls(MediaType.AUDIO, encodingConfiguration);
videoControls = mediaConfiguration.
createEncodingControls(MediaType.VIDEO,
encodingConfiguration, false);
createEncodingControls(MediaType.VIDEO, encodingConfiguration);
JPanel mainPanel = new TransparentPanel();
mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
@ -200,11 +198,9 @@ private void resetTables()
audioPanel.remove(audioControls);
videoPanel.remove(videoControls);
audioControls = mediaConfiguration.
createEncodingControls(MediaType.AUDIO,
encodingConfiguration, false);
createEncodingControls(MediaType.AUDIO, encodingConfiguration);
videoControls = mediaConfiguration.
createEncodingControls(MediaType.VIDEO,
encodingConfiguration, false);
createEncodingControls(MediaType.VIDEO, encodingConfiguration);
audioPanel.add(audioControls);
videoPanel.add(videoControls);

@ -94,8 +94,6 @@ public void setValueAt(Object value, int rowIndex, int columnIndex)
// We fire the update event before setting the configuration
// property in order to have more reactive user interface.
fireTableCellUpdated(rowIndex, columnIndex);
//encodingConfiguration.setPriorityConfig(encoding, priority);
}
}

Loading…
Cancel
Save