[Libreoffice-commits] .: avmedia/source connectivity/com connectivity/inc
David Tardon
dtardon at kemper.freedesktop.org
Sun Oct 17 00:13:49 PDT 2010
avmedia/source/gstreamer/gstplayer.cxx | 30 -------
connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java | 42 ----------
connectivity/inc/connectivity/CommonTools.hxx | 2
3 files changed, 1 insertion(+), 73 deletions(-)
New commits:
commit 50659c9893fb5f98ab5c0751cc7c36ac880560c5
Author: Luke Symes <allsymes at gmail.com>
Date: Sun Oct 17 09:13:35 2010 +0200
cleanup some more dead code under connectivity
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 78a3a9a..e415080 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -126,13 +126,8 @@ static GstBusSyncReply gst_pipeline_bus_sync_handler( GstBus *, GstMessage * mes
void Player::processMessage( GstMessage *message )
{
- //DBG ( "gst message received: src name: %s structure type: %s",
- // gst_object_get_name (message->src),
- // message->structure ? gst_structure_get_name (message->structure) : "<none>");
-
switch( GST_MESSAGE_TYPE( message ) ) {
case GST_MESSAGE_EOS:
- //DBG( "EOS, reset state to NULL" );
gst_element_set_state( mpPlaybin, GST_STATE_READY );
mbPlayPending = false;
if (mbLooping)
@@ -160,9 +155,6 @@ void Player::processMessage( GstMessage *message )
GstBusSyncReply Player::processSyncMessage( GstMessage *message )
{
DBG( "%p processSyncMessage", this );
- //DBG ( "gst message received: src name: %s structure type: %s",
- // gst_object_get_name (message->src),
- // message->structure ? gst_structure_get_name (message->structure) : "<none>");
if (message->structure) {
if( !strcmp( gst_structure_get_name( message->structure ), "prepare-xwindow-id" ) && mnWindowID != 0 ) {
@@ -245,9 +237,6 @@ void Player::preparePlaybin( const ::rtl::OUString& rURL, bool bFakeVideo )
{
GstBus *pBus;
- //sal_Bool aSuccess = osl_setCondition( maSizeCondition );
- //DBG( "%p set condition result: %d", this, aSuccess );
-
if( mpPlaybin != NULL ) {
gst_element_set_state( mpPlaybin, GST_STATE_NULL );
mbPlayPending = false;
@@ -301,8 +290,6 @@ bool Player::create( const ::rtl::OUString& rURL )
void SAL_CALL Player::start( )
throw (uno::RuntimeException)
{
- //DBG ("Player::start");
-
// set the pipeline state to READY and run the loop
if( mbInitialized && NULL != mpPlaybin )
{
@@ -352,8 +339,6 @@ double SAL_CALL Player::getDuration( )
if( mpPlaybin && mnDuration > 0 ) {
duration = mnDuration / 1E9;
-
- //DBG( "gst duration: %lld ns duration: %lf s", gst_duration, duration );
}
return duration;
@@ -516,8 +501,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB( )
g_object_get( G_OBJECT( mpPlaybin ), "volume", &nGstVolume, NULL );
nVolumeDB = (sal_Int16) ( 20.0*log10 ( nGstVolume ) );
-
- //DBG( "get volume: %d gst volume: %lf", nVolumeDB, nGstVolume );
}
return nVolumeDB;
@@ -573,9 +556,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
rArguments[ 2 ] >>= mnWindowID;
DBG( "window ID: %ld", mnWindowID );
}
-
- //if( !pWindow->create( aArguments ) )
- //xRet = uno::Reference< ::media::XPlayerWindow >();
}
return xRet;
@@ -588,16 +568,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
{
uno::Reference< media::XFrameGrabber > xRet;
- /*if( maURL.getLength() > 0 )
- {
- FrameGrabber* pGrabber = new FrameGrabber( mxMgr );
-
- xRet = pGrabber;
-
- if( !pGrabber->create( maURL ) )
- xRet.clear();
- }*/
-
return xRet;
}
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
index 52d4035..8a1af51 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
@@ -24,25 +24,14 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/*
- * StorageAccess.java
- *
- * Created on 17. August 2004, 13:32
- */
package com.sun.star.sdbcx.comp.hsqldb;
-/**
- *
- * @author oj93728
- */
-
public class StorageAccess implements org.hsqldb.lib.Storage {
String key;
String name;
boolean readonly;
NativeStorageAccess access;
-// public SimpleLog appLog;
/** Creates a new instance of StorageAccess */
public StorageAccess(String name,Boolean readonly,Object key) throws java.io.IOException{
this.key = (String)key;
@@ -55,37 +44,29 @@ public class StorageAccess implements org.hsqldb.lib.Storage {
} catch(Exception e){
throw new java.io.IOException();
}
- // appLog = new SimpleLog(name +".app3.log", true);
}
public void close() throws java.io.IOException{
- //appLog.sendLine("NIOScaledRAFile.close() ");
- //appLog.close();
access.close(name,key);
}
public long getFilePointer() throws java.io.IOException{
- //appLog.sendLine("NIOScaledRAFile.getFilePointer() ");
return access.getFilePointer(name,key);
}
public long length() throws java.io.IOException{
- //appLog.sendLine("NIOScaledRAFile.length() ");
return access.length(name,key);
}
public int read() throws java.io.IOException{
- //appLog.sendLine("NIOScaledRAFile.read() ");
return access.read(name,key);
}
public void read(byte[] b, int off, int len) throws java.io.IOException{
- //appLog.sendLine("NIOScaledRAFile.read(" + b + ","+ off +","+len + ") ");
access.read(name,key,b,off,len);
}
- // fredt - this is based on the same code that reads an int from the .data file in HSQLDB
+ // based on the same code that reads an int from the .data file in HSQLDB
public int readInt() throws java.io.IOException{
- //appLog.sendLine("NIOScaledRAFile.readInt() ");
byte [] tmp = new byte [4];
int count = access.read(name,key,tmp,0, 4);
@@ -101,35 +82,17 @@ public class StorageAccess implements org.hsqldb.lib.Storage {
int ch3 = tmp[count] & 0xff;
return ((ch0 << 24) + (ch1 << 16) + (ch2 << 8) + (ch3));
-
-/*
- int ch [] = new int[4];
- for(int i = 0;i < 4; ++i){
- ch[i] = tmp[i];
- if (ch[i] < 0 ){
- ch[i] = 256 + ch[i];
- }
- }
-
- if ((ch[0] | ch[1] | ch[2] | ch[3]) < 0)
- throw new java.io.IOException();
- return ((ch[0] << 24) + (ch[1] << 16) + (ch[2] << 8) + (ch[3] << 0));
- //return access.readInt(name,key);
-*/
}
public void seek(long position) throws java.io.IOException{
- //appLog.sendLine("NIOScaledRAFile.seek("+position +") ");
access.seek(name,key,position);
}
public void write(byte[] b, int offset, int length) throws java.io.IOException{
- //appLog.sendLine("NIOScaledRAFile.write(" + b + "," + offset +","+length+") ");
access.write(name,key,b,offset,length);
}
public void writeInt(int v) throws java.io.IOException{
- //appLog.sendLine("NIOScaledRAFile.writeInt(" +v+") ");
byte [] oneByte = new byte [4];
oneByte[0] = (byte) ((v >>> 24) & 0xFF);
oneByte[1] = (byte) ((v >>> 16) & 0xFF);
@@ -143,9 +106,7 @@ public class StorageAccess implements org.hsqldb.lib.Storage {
return readonly;
}
- // fredt - minor change of brackets
public long readLong() throws java.io.IOException {
- // return ((long)(readInt()) << 32) + (readInt() & 0xFFFFFFFFL);
return (((long) readInt()) << 32) + (((long) readInt()) & 0xFFFFFFFFL);
}
@@ -154,7 +115,6 @@ public class StorageAccess implements org.hsqldb.lib.Storage {
}
public void writeLong(long v) throws java.io.IOException {
- //appLog.sendLine("NIOScaledRAFile.writeLong(" +v+") ");
byte [] oneByte = new byte [8];
oneByte[0] = (byte) ((v >>> 56) & 0xFF);
diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx
index fa13c0e..862cc67 100644
--- a/connectivity/inc/connectivity/CommonTools.hxx
+++ b/connectivity/inc/connectivity/CommonTools.hxx
@@ -72,8 +72,6 @@ namespace connectivity
{
std::vector< VectorVal > m_vector;
oslInterlockedCount m_refCount;
- // ORefVector(const ORefVector&);
- // ORefVector& operator=(const ORefVector&);
protected:
virtual ~ORefVector(){}
More information about the Libreoffice-commits
mailing list